diff options
| author | Karoly Lorentey | 2005-06-15 12:57:51 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-06-15 12:57:51 +0000 |
| commit | ef85512e51f043d73788f00a2aed13cccde0682c (patch) | |
| tree | fc1fa1378533250f260ef8eaa9a84ae882d9df84 /src/frame.c | |
| parent | 8736257554f49445f7b4402ac7a9436b38ce6452 (diff) | |
| parent | ef88a9999004e6c26148c8d280d6a41f623d7249 (diff) | |
| download | emacs-ef85512e51f043d73788f00a2aed13cccde0682c.tar.gz emacs-ef85512e51f043d73788f00a2aed13cccde0682c.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 80-82, 350-422)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-350
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-351
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-352
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-353
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-354
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-355
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-356
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-357
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-358
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-359
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-360
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-361
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-362
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-363
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-364
Remove "-face" suffix from widget faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-365
Remove "-face" suffix from custom faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Remove "-face" suffix from change-log faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-367
Remove "-face" suffix from compilation faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-368
Remove "-face" suffix from diff-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-369
lisp/longlines.el (longlines-visible-face): Face removed
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-370
Remove "-face" suffix from woman faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-371
Remove "-face" suffix from whitespace-highlight face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-372
Remove "-face" suffix from ruler-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-373
Remove "-face" suffix from show-paren faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-374
Remove "-face" suffix from log-view faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375
Remove "-face" suffix from smerge faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-376
Remove "-face" suffix from show-tabs faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-377
Remove "-face" suffix from highlight-changes faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-378
Remove "-face" suffix from and downcase info faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-379
Remove "-face" suffix from pcvs faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-380
Update uses of renamed pcvs faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-381
Tweak ChangeLog
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-382
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-383
Remove "-face" suffix from strokes-char face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-384
Remove "-face" suffix from compare-windows face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-385
Remove "-face" suffix from calendar faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-386
Remove "-face" suffix from diary-button face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-387
Remove "-face" suffix from testcover faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-388
Remove "-face" suffix from viper faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-389
Remove "-face" suffix from org faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-390
Remove "-face" suffix from sgml-namespace face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-391
Remove "-face" suffix from table-cell face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-392
Remove "-face" suffix from tex-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-393
Remove "-face" suffix from texinfo-heading face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-394
Remove "-face" suffix from flyspell faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-395
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-396
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-397
Remove "-face" suffix from gomoku faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-398
Remove "-face" suffix from mpuz faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-399
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-400
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-401
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-402
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-403
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-404
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-405
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-406
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-407
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-408
Remove "-face" suffix from Buffer-menu-buffer face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-409
Remove "-face" suffix from antlr-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-410
Remove "-face" suffix from ebrowse faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-411
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-412
Remove "-face" suffix from flymake faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-413
Remove "-face" suffix from idlwave faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-414
Remove "-face" suffix from sh-script faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-415
Remove "-face" suffix from vhdl-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-416
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-417
Remove "-face" suffix from which-func face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-418
Remove "-face" suffix from cperl-mode faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-419
Remove "-face" suffix from ld-script faces
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-420
Fix cperl-mode font-lock problem
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-421
Tweak which-func face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-422
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-80
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-81
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-82
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/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 f86cb0d43da..10318ba7110 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -905,7 +905,7 @@ do_switch_frame (frame, track, for_deletion) | |||
| 905 | return frame; | 905 | return frame; |
| 906 | } | 906 | } |
| 907 | 907 | ||
| 908 | DEFUN ("select-frame", Fselect_frame, Sselect_frame, 1, 2, "e", | 908 | DEFUN ("select-frame", Fselect_frame, Sselect_frame, 1, 1, "e", |
| 909 | doc: /* Select the frame FRAME. | 909 | doc: /* Select the frame FRAME. |
| 910 | Subsequent editing commands apply to its selected window. | 910 | Subsequent editing commands apply to its selected window. |
| 911 | The selection of FRAME lasts until the next time the user does | 911 | 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 | |||
| 916 | focus. On a text-only terminal, the next redisplay will display FRAME. | 916 | focus. On a text-only terminal, the next redisplay will display FRAME. |
| 917 | 917 | ||
| 918 | This function returns FRAME, or nil if FRAME has been deleted. */) | 918 | This function returns FRAME, or nil if FRAME has been deleted. */) |
| 919 | (frame, no_enter) | 919 | (frame) |
| 920 | Lisp_Object frame, no_enter; | 920 | Lisp_Object frame; |
| 921 | { | 921 | { |
| 922 | return do_switch_frame (frame, 1, 0); | 922 | return do_switch_frame (frame, 1, 0); |
| 923 | } | 923 | } |
| 924 | 924 | ||
| 925 | 925 | ||
| 926 | DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 2, "e", | 926 | DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 1, "e", |
| 927 | doc: /* Handle a switch-frame event EVENT. | 927 | doc: /* Handle a switch-frame event EVENT. |
| 928 | Switch-frame events are usually bound to this function. | 928 | Switch-frame events are usually bound to this function. |
| 929 | A switch-frame event tells Emacs that the window manager has requested | 929 | 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. | |||
| 932 | 932 | ||
| 933 | If EVENT is frame object, handle it as if it were a switch-frame event | 933 | If EVENT is frame object, handle it as if it were a switch-frame event |
| 934 | to that frame. */) | 934 | to that frame. */) |
| 935 | (event, no_enter) | 935 | (event) |
| 936 | Lisp_Object event, no_enter; | 936 | Lisp_Object event; |
| 937 | { | 937 | { |
| 938 | /* Preserve prefix arg that the command loop just cleared. */ | 938 | /* Preserve prefix arg that the command loop just cleared. */ |
| 939 | current_kboard->Vprefix_arg = Vcurrent_prefix_arg; | 939 | current_kboard->Vprefix_arg = Vcurrent_prefix_arg; |
| @@ -1754,7 +1754,7 @@ before calling this function on it, like this. | |||
| 1754 | #if defined (MSDOS) && defined (HAVE_MOUSE) | 1754 | #if defined (MSDOS) && defined (HAVE_MOUSE) |
| 1755 | if (FRAME_MSDOS_P (XFRAME (frame))) | 1755 | if (FRAME_MSDOS_P (XFRAME (frame))) |
| 1756 | { | 1756 | { |
| 1757 | Fselect_frame (frame, Qnil); | 1757 | Fselect_frame (frame); |
| 1758 | mouse_moveto (XINT (x), XINT (y)); | 1758 | mouse_moveto (XINT (x), XINT (y)); |
| 1759 | } | 1759 | } |
| 1760 | #endif | 1760 | #endif |
| @@ -1786,7 +1786,7 @@ before calling this function on it, like this. | |||
| 1786 | #if defined (MSDOS) && defined (HAVE_MOUSE) | 1786 | #if defined (MSDOS) && defined (HAVE_MOUSE) |
| 1787 | if (FRAME_MSDOS_P (XFRAME (frame))) | 1787 | if (FRAME_MSDOS_P (XFRAME (frame))) |
| 1788 | { | 1788 | { |
| 1789 | Fselect_frame (frame, Qnil); | 1789 | Fselect_frame (frame); |
| 1790 | mouse_moveto (XINT (x), XINT (y)); | 1790 | mouse_moveto (XINT (x), XINT (y)); |
| 1791 | } | 1791 | } |
| 1792 | #endif | 1792 | #endif |
| @@ -1908,7 +1908,7 @@ If omitted, FRAME defaults to the currently selected frame. */) | |||
| 1908 | #if 0 /* This isn't logically necessary, and it can do GC. */ | 1908 | #if 0 /* This isn't logically necessary, and it can do GC. */ |
| 1909 | /* Don't let the frame remain selected. */ | 1909 | /* Don't let the frame remain selected. */ |
| 1910 | if (EQ (frame, selected_frame)) | 1910 | if (EQ (frame, selected_frame)) |
| 1911 | Fhandle_switch_frame (next_frame (frame, Qt), Qnil); | 1911 | Fhandle_switch_frame (next_frame (frame, Qt)); |
| 1912 | #endif | 1912 | #endif |
| 1913 | 1913 | ||
| 1914 | /* Don't allow minibuf_window to remain on a deleted frame. */ | 1914 | /* Don't allow minibuf_window to remain on a deleted frame. */ |