From: Stefan Monnier Date: Sat, 17 May 2003 21:17:45 +0000 (+0000) Subject: (Fselect_window): Add optional arg `norecord'. X-Git-Tag: ttn-vms-21-2-B4~10118 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f1321dc307e63c17ce838e0b32e2708fd351f1df;p=emacs.git (Fselect_window): Add optional arg `norecord'. --- diff --git a/src/buffer.c b/src/buffer.c index d45c8d70ce5..ca9111f2e47 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1,5 +1,5 @@ /* Buffer manipulation primitives for GNU Emacs. - Copyright (C) 1985,86,87,88,89,93,94,95,97,98, 1999, 2000, 2001, 2002 + Copyright (C) 1985,86,87,88,89,93,94,95,97,98, 1999, 2000, 2001, 02, 2003 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -1661,9 +1661,9 @@ do not put this buffer at the front of the list of recently selected ones. */) } Fset_buffer (buf); if (NILP (norecord)) - /* This seems bogus since Fselect_window will call record_buffer anyway. */ + /* Why bother ? Fselect_window will do it for us anyway. -stef */ record_buffer (buf); - Fselect_window (Fdisplay_buffer (buf, other_window, Qnil)); + Fselect_window (Fdisplay_buffer (buf, other_window, Qnil), norecord); return buf; } diff --git a/src/callint.c b/src/callint.c index f80f3c62027..4edb4201fa4 100644 --- a/src/callint.c +++ b/src/callint.c @@ -1,5 +1,5 @@ /* Call a Lisp function interactively. - Copyright (C) 1985, 86, 93, 94, 95, 1997, 2000, 2002 + Copyright (C) 1985, 86, 93, 94, 95, 1997, 2000, 02, 2003 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -379,7 +379,7 @@ supply if the command inquires which events were used to invoke it. */) if (i != num_input_events || !NILP (record_flag)) { /* We should record this command on the command history. */ - Lisp_Object values, car; + Lisp_Object values; /* Make a copy of the list of values, for the command history, and turn them into things we can eval. */ values = quotify_args (Fcopy_sequence (specs)); @@ -456,7 +456,7 @@ supply if the command inquires which events were used to invoke it. */) if (!NILP (Vmouse_leave_buffer_hook)) call1 (Vrun_hooks, Qmouse_leave_buffer_hook); - Fselect_window (event); + Fselect_window (event, Qnil); } string++; } diff --git a/src/frame.c b/src/frame.c index 697c2b8aabe..af280f13537 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1,5 +1,5 @@ /* Generic frame functions. - Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001 + Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2003 Free Software Foundation. This file is part of GNU Emacs. @@ -682,7 +682,7 @@ do_switch_frame (frame, track, for_deletion) if (! FRAME_MINIBUF_ONLY_P (XFRAME (selected_frame))) last_nonminibuf_frame = XFRAME (selected_frame); - Fselect_window (XFRAME (frame)->selected_window); + Fselect_window (XFRAME (frame)->selected_window, Qnil); #ifndef WINDOWSNT /* Make sure to switch the tty color mode to that of the newly @@ -860,7 +860,7 @@ If FRAME is the selected frame, this makes WINDOW the selected window. */) error ("In `set-frame-selected-window', WINDOW is not on FRAME"); if (EQ (frame, selected_frame)) - return Fselect_window (window); + return Fselect_window (window, Qnil); return XFRAME (frame)->selected_window = window; } @@ -1234,7 +1234,7 @@ The functions are run with one arg, the frame to be deleted. */) /* If the dying minibuffer window was selected, select the new one. */ if (minibuffer_selected) - Fselect_window (minibuf_window); + Fselect_window (minibuf_window, Qnil); } /* Don't let echo_area_window to remain on a deleted frame. */ diff --git a/src/macterm.c b/src/macterm.c index c1806cab714..dcad5b38442 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -3235,7 +3235,7 @@ x_new_focus_frame (dpyinfo, frame) selected_frame = frame; XSETFRAME (XWINDOW (selected_frame->selected_window)->frame, selected_frame); - Fselect_window (selected_frame->selected_window); + Fselect_window (selected_frame->selected_window, Qnil); choose_minibuf_frame (); #endif /* ! 0 */ diff --git a/src/minibuf.c b/src/minibuf.c index 417e023469d..63799a2be76 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -589,7 +589,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag, if (minibuf_level == 1 || !EQ (minibuf_window, selected_window)) minibuf_selected_window = selected_window; Fset_window_buffer (minibuf_window, Fcurrent_buffer ()); - Fselect_window (minibuf_window); + Fselect_window (minibuf_window, Qnil); XSETFASTINT (XWINDOW (minibuf_window)->hscroll, 0); Fmake_local_variable (Qprint_escape_newlines); diff --git a/src/window.h b/src/window.h index ed5bc6b14b1..c5da959c238 100644 --- a/src/window.h +++ b/src/window.h @@ -1,5 +1,5 @@ /* Window definitions for GNU Emacs. - Copyright (C) 1985, 1986, 1993, 1995, 1997, 1998, 1999, 2000, 2001 + Copyright (C) 1985, 1986, 1993, 1995, 1997, 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -366,7 +366,7 @@ extern Lisp_Object Vmouse_window; extern Lisp_Object Vmouse_event; EXFUN (Fnext_window, 3); -EXFUN (Fselect_window, 1); +EXFUN (Fselect_window, 2); EXFUN (Fdisplay_buffer, 3); EXFUN (Fset_window_buffer, 2); EXFUN (Fset_window_hscroll, 2); diff --git a/src/xterm.c b/src/xterm.c index 635fe3f28e4..0992e1fac9d 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -1,5 +1,5 @@ /* X Communication module for terminals which understand the X protocol. - Copyright (C) 1989, 93, 94, 95, 96, 1997, 1998, 1999, 2000, 2001, 2002 + Copyright (C) 1989, 93, 94, 95, 96, 97, 98, 1999, 2000, 01, 02, 2003 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -3103,7 +3103,7 @@ x_new_focus_frame (dpyinfo, frame) selected_frame = frame; XSETFRAME (XWINDOW (selected_frame->selected_window)->frame, selected_frame); - Fselect_window (selected_frame->selected_window); + Fselect_window (selected_frame->selected_window, Qnil); choose_minibuf_frame (); #endif /* ! 0 */