diff options
author | Karoly Lorentey <[email protected]> | 2005-06-15 12:57:51 +0000 |
---|---|---|
committer | Karoly Lorentey <[email protected]> | 2005-06-15 12:57:51 +0000 |
commit | ef85512e51f043d73788f00a2aed13cccde0682c (patch) | |
tree | fc1fa1378533250f260ef8eaa9a84ae882d9df84 /src/frame.c | |
parent | 8736257554f49445f7b4402ac7a9436b38ce6452 (diff) | |
parent | ef88a9999004e6c26148c8d280d6a41f623d7249 (diff) |
Merged from [email protected] (patch 80-82, 350-422)
Patches applied:
* [email protected]/emacs--cvs-trunk--0--patch-350
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-351
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-352
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-353
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-354
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-355
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-356
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-357
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-358
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-359
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-360
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-361
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-362
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-363
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-364
Remove "-face" suffix from widget faces
* [email protected]/emacs--cvs-trunk--0--patch-365
Remove "-face" suffix from custom faces
* [email protected]/emacs--cvs-trunk--0--patch-366
Remove "-face" suffix from change-log faces
* [email protected]/emacs--cvs-trunk--0--patch-367
Remove "-face" suffix from compilation faces
* [email protected]/emacs--cvs-trunk--0--patch-368
Remove "-face" suffix from diff-mode faces
* [email protected]/emacs--cvs-trunk--0--patch-369
lisp/longlines.el (longlines-visible-face): Face removed
* [email protected]/emacs--cvs-trunk--0--patch-370
Remove "-face" suffix from woman faces
* [email protected]/emacs--cvs-trunk--0--patch-371
Remove "-face" suffix from whitespace-highlight face
* [email protected]/emacs--cvs-trunk--0--patch-372
Remove "-face" suffix from ruler-mode faces
* [email protected]/emacs--cvs-trunk--0--patch-373
Remove "-face" suffix from show-paren faces
* [email protected]/emacs--cvs-trunk--0--patch-374
Remove "-face" suffix from log-view faces
* [email protected]/emacs--cvs-trunk--0--patch-375
Remove "-face" suffix from smerge faces
* [email protected]/emacs--cvs-trunk--0--patch-376
Remove "-face" suffix from show-tabs faces
* [email protected]/emacs--cvs-trunk--0--patch-377
Remove "-face" suffix from highlight-changes faces
* [email protected]/emacs--cvs-trunk--0--patch-378
Remove "-face" suffix from and downcase info faces
* [email protected]/emacs--cvs-trunk--0--patch-379
Remove "-face" suffix from pcvs faces
* [email protected]/emacs--cvs-trunk--0--patch-380
Update uses of renamed pcvs faces
* [email protected]/emacs--cvs-trunk--0--patch-381
Tweak ChangeLog
* [email protected]/emacs--cvs-trunk--0--patch-382
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-383
Remove "-face" suffix from strokes-char face
* [email protected]/emacs--cvs-trunk--0--patch-384
Remove "-face" suffix from compare-windows face
* [email protected]/emacs--cvs-trunk--0--patch-385
Remove "-face" suffix from calendar faces
* [email protected]/emacs--cvs-trunk--0--patch-386
Remove "-face" suffix from diary-button face
* [email protected]/emacs--cvs-trunk--0--patch-387
Remove "-face" suffix from testcover faces
* [email protected]/emacs--cvs-trunk--0--patch-388
Remove "-face" suffix from viper faces
* [email protected]/emacs--cvs-trunk--0--patch-389
Remove "-face" suffix from org faces
* [email protected]/emacs--cvs-trunk--0--patch-390
Remove "-face" suffix from sgml-namespace face
* [email protected]/emacs--cvs-trunk--0--patch-391
Remove "-face" suffix from table-cell face
* [email protected]/emacs--cvs-trunk--0--patch-392
Remove "-face" suffix from tex-mode faces
* [email protected]/emacs--cvs-trunk--0--patch-393
Remove "-face" suffix from texinfo-heading face
* [email protected]/emacs--cvs-trunk--0--patch-394
Remove "-face" suffix from flyspell faces
* [email protected]/emacs--cvs-trunk--0--patch-395
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-396
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-397
Remove "-face" suffix from gomoku faces
* [email protected]/emacs--cvs-trunk--0--patch-398
Remove "-face" suffix from mpuz faces
* [email protected]/emacs--cvs-trunk--0--patch-399
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-400
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-401
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-402
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-403
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-404
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-405
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-406
Merge from gnus--rel--5.10
* [email protected]/emacs--cvs-trunk--0--patch-407
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-408
Remove "-face" suffix from Buffer-menu-buffer face
* [email protected]/emacs--cvs-trunk--0--patch-409
Remove "-face" suffix from antlr-mode faces
* [email protected]/emacs--cvs-trunk--0--patch-410
Remove "-face" suffix from ebrowse faces
* [email protected]/emacs--cvs-trunk--0--patch-411
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-412
Remove "-face" suffix from flymake faces
* [email protected]/emacs--cvs-trunk--0--patch-413
Remove "-face" suffix from idlwave faces
* [email protected]/emacs--cvs-trunk--0--patch-414
Remove "-face" suffix from sh-script faces
* [email protected]/emacs--cvs-trunk--0--patch-415
Remove "-face" suffix from vhdl-mode faces
* [email protected]/emacs--cvs-trunk--0--patch-416
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-417
Remove "-face" suffix from which-func face
* [email protected]/emacs--cvs-trunk--0--patch-418
Remove "-face" suffix from cperl-mode faces
* [email protected]/emacs--cvs-trunk--0--patch-419
Remove "-face" suffix from ld-script faces
* [email protected]/emacs--cvs-trunk--0--patch-420
Fix cperl-mode font-lock problem
* [email protected]/emacs--cvs-trunk--0--patch-421
Tweak which-func face
* [email protected]/emacs--cvs-trunk--0--patch-422
Update from CVS
* [email protected]/gnus--rel--5.10--patch-80
Merge from emacs--cvs-trunk--0
* [email protected]/gnus--rel--5.10--patch-81
Update from CVS
* [email protected]/gnus--rel--5.10--patch-82
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-350
Diffstat (limited to 'src/frame.c')
-rw-r--r-- | src/frame.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/frame.c b/src/frame.c index f86cb0d43d..10318ba711 100644 --- a/src/frame.c +++ b/src/frame.c @@ -905,7 +905,7 @@ do_switch_frame (frame, track, for_deletion) return frame; } -DEFUN ("select-frame", Fselect_frame, Sselect_frame, 1, 2, "e", +DEFUN ("select-frame", Fselect_frame, Sselect_frame, 1, 1, "e", doc: /* Select the frame FRAME. Subsequent editing commands apply to its selected window. The selection of FRAME lasts until the next time the user does @@ -916,14 +916,14 @@ the command loop, because it still may have the window system's input focus. On a text-only terminal, the next redisplay will display FRAME. This function returns FRAME, or nil if FRAME has been deleted. */) - (frame, no_enter) - Lisp_Object frame, no_enter; + (frame) + Lisp_Object frame; { return do_switch_frame (frame, 1, 0); } -DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 2, "e", +DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 1, "e", doc: /* Handle a switch-frame event EVENT. Switch-frame events are usually bound to this function. A switch-frame event tells Emacs that the window manager has requested @@ -932,8 +932,8 @@ This function selects the selected window of the frame of EVENT. If EVENT is frame object, handle it as if it were a switch-frame event to that frame. */) - (event, no_enter) - Lisp_Object event, no_enter; + (event) + Lisp_Object event; { /* Preserve prefix arg that the command loop just cleared. */ current_kboard->Vprefix_arg = Vcurrent_prefix_arg; @@ -1754,7 +1754,7 @@ before calling this function on it, like this. #if defined (MSDOS) && defined (HAVE_MOUSE) if (FRAME_MSDOS_P (XFRAME (frame))) { - Fselect_frame (frame, Qnil); + Fselect_frame (frame); mouse_moveto (XINT (x), XINT (y)); } #endif @@ -1786,7 +1786,7 @@ before calling this function on it, like this. #if defined (MSDOS) && defined (HAVE_MOUSE) if (FRAME_MSDOS_P (XFRAME (frame))) { - Fselect_frame (frame, Qnil); + Fselect_frame (frame); mouse_moveto (XINT (x), XINT (y)); } #endif @@ -1908,7 +1908,7 @@ If omitted, FRAME defaults to the currently selected frame. */) #if 0 /* This isn't logically necessary, and it can do GC. */ /* Don't let the frame remain selected. */ if (EQ (frame, selected_frame)) - Fhandle_switch_frame (next_frame (frame, Qt), Qnil); + Fhandle_switch_frame (next_frame (frame, Qt)); #endif /* Don't allow minibuf_window to remain on a deleted frame. */ |