diff options
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. */ |