aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorErik Naggum1996-01-09 00:32:25 +0000
committerErik Naggum1996-01-09 00:32:25 +0000
commit735eeca3172245f71acaf0534cec6261956962f5 (patch)
treecb77e2f8b309f9273c2fabaee7a5311de0419ae5 /src
parent3e67070281acdd8a1e37af7d40806003d8e8e508 (diff)
downloademacs-735eeca3172245f71acaf0534cec6261956962f5.tar.gz
emacs-735eeca3172245f71acaf0534cec6261956962f5.zip
(Fhandle_switch_frame, Fset_frame_height): Harmonize arguments with
documentation.
Diffstat (limited to 'src')
-rw-r--r--src/frame.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/frame.c b/src/frame.c
index 33bb571fe95..a09b6546083 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -626,13 +626,13 @@ This function selects the selected window of the frame of EVENT.\n\
626\n\ 626\n\
627If EVENT is frame object, handle it as if it were a switch-frame event\n\ 627If EVENT is frame object, handle it as if it were a switch-frame event\n\
628to that frame.") 628to that frame.")
629 (frame, no_enter) 629 (event, no_enter)
630 Lisp_Object frame, no_enter; 630 Lisp_Object event, no_enter;
631{ 631{
632 /* Preserve prefix arg that the command loop just cleared. */ 632 /* Preserve prefix arg that the command loop just cleared. */
633 current_kboard->Vprefix_arg = Vcurrent_prefix_arg; 633 current_kboard->Vprefix_arg = Vcurrent_prefix_arg;
634 call1 (Vrun_hooks, Qmouse_leave_buffer_hook); 634 call1 (Vrun_hooks, Qmouse_leave_buffer_hook);
635 return do_switch_frame (frame, no_enter, 0); 635 return do_switch_frame (event, no_enter, 0);
636} 636}
637 637
638DEFUN ("ignore-event", Fignore_event, Signore_event, 0, 0, "", 638DEFUN ("ignore-event", Fignore_event, Signore_event, 0, 0, "",
@@ -1876,12 +1876,12 @@ DEFUN ("set-frame-height", Fset_frame_height, Sset_frame_height, 2, 3, 0,
1876 "Specify that the frame FRAME has LINES lines.\n\ 1876 "Specify that the frame FRAME has LINES lines.\n\
1877Optional third arg non-nil means that redisplay should use LINES lines\n\ 1877Optional third arg non-nil means that redisplay should use LINES lines\n\
1878but that the idea of the actual height of the frame should not be changed.") 1878but that the idea of the actual height of the frame should not be changed.")
1879 (frame, rows, pretend) 1879 (frame, lines, pretend)
1880 Lisp_Object frame, rows, pretend; 1880 Lisp_Object frame, lines, pretend;
1881{ 1881{
1882 register struct frame *f; 1882 register struct frame *f;
1883 1883
1884 CHECK_NUMBER (rows, 0); 1884 CHECK_NUMBER (lines, 0);
1885 if (NILP (frame)) 1885 if (NILP (frame))
1886 f = selected_frame; 1886 f = selected_frame;
1887 else 1887 else
@@ -1894,12 +1894,12 @@ but that the idea of the actual height of the frame should not be changed.")
1894#ifdef HAVE_WINDOW_SYSTEM 1894#ifdef HAVE_WINDOW_SYSTEM
1895 if (FRAME_WINDOW_P (f)) 1895 if (FRAME_WINDOW_P (f))
1896 { 1896 {
1897 if (XINT (rows) != f->height) 1897 if (XINT (lines) != f->height)
1898 x_set_window_size (f, 1, f->width, XINT (rows)); 1898 x_set_window_size (f, 1, f->width, XINT (lines));
1899 } 1899 }
1900 else 1900 else
1901#endif 1901#endif
1902 change_frame_size (f, XINT (rows), 0, !NILP (pretend), 0); 1902 change_frame_size (f, XINT (lines), 0, !NILP (pretend), 0);
1903 return Qnil; 1903 return Qnil;
1904} 1904}
1905 1905