# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1053206265 0
# Node ID 7ac9c3bea5ea77d36068d5a95aa7a6f5edc832e8
# Parent  497252d655f0779ad4ae05943dffc6b9979c159f
(Fselect_window): Add optional arg `norecord'.

diff -r 497252d655f0 -r 7ac9c3bea5ea src/buffer.c
--- a/src/buffer.c	Sat May 17 20:29:40 2003 +0000
+++ b/src/buffer.c	Sat May 17 21:17:45 2003 +0000
@@ -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 @@
     }
   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 -r 497252d655f0 -r 7ac9c3bea5ea src/callint.c
--- a/src/callint.c	Sat May 17 20:29:40 2003 +0000
+++ b/src/callint.c	Sat May 17 21:17:45 2003 +0000
@@ -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 @@
       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 @@
 	      if (!NILP (Vmouse_leave_buffer_hook))
 		call1 (Vrun_hooks, Qmouse_leave_buffer_hook);
 
-	      Fselect_window (event);
+	      Fselect_window (event, Qnil);
 	    }
 	  string++;
 	}
diff -r 497252d655f0 -r 7ac9c3bea5ea src/frame.c
--- a/src/frame.c	Sat May 17 20:29:40 2003 +0000
+++ b/src/frame.c	Sat May 17 21:17:45 2003 +0000
@@ -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 @@
   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 @@
     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 @@
       /* 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 -r 497252d655f0 -r 7ac9c3bea5ea src/macterm.c
--- a/src/macterm.c	Sat May 17 20:29:40 2003 +0000
+++ b/src/macterm.c	Sat May 17 21:17:45 2003 +0000
@@ -3235,7 +3235,7 @@
       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 -r 497252d655f0 -r 7ac9c3bea5ea src/minibuf.c
--- a/src/minibuf.c	Sat May 17 20:29:40 2003 +0000
+++ b/src/minibuf.c	Sat May 17 21:17:45 2003 +0000
@@ -589,7 +589,7 @@
   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 -r 497252d655f0 -r 7ac9c3bea5ea src/window.h
--- a/src/window.h	Sat May 17 20:29:40 2003 +0000
+++ b/src/window.h	Sat May 17 21:17:45 2003 +0000
@@ -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_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 -r 497252d655f0 -r 7ac9c3bea5ea src/xterm.c
--- a/src/xterm.c	Sat May 17 20:29:40 2003 +0000
+++ b/src/xterm.c	Sat May 17 21:17:45 2003 +0000
@@ -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 @@
       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 */