# HG changeset patch
# User Nick Roberts <nickrob@snap.net.nz>
# Date 1156452053 0
# Node ID 6ccb18aa8a5de1a5b58b80038178e43e49d8cad7
# Parent  552742f761d7a2a36459be349b762d080a93c289
(Fswitch_to_buffer): Move buffer to front of
buffer-alist if necessary.

diff -r 552742f761d7 -r 6ccb18aa8a5d src/buffer.c
--- a/src/buffer.c	Thu Aug 24 20:40:26 2006 +0000
+++ b/src/buffer.c	Thu Aug 24 20:40:53 2006 +0000
@@ -1684,9 +1684,13 @@
   char *err;
 
   if (EQ (buffer, Fwindow_buffer (selected_window)))
-    /* Basically a NOP.  Avoid signalling an error if the selected window
-       is dedicated, or a minibuffer, ...  */
-    return Fset_buffer (buffer);
+    {
+      if (NILP (norecord)  && !EQ (buffer, XCDR (XCAR (Vbuffer_alist))))
+	record_buffer (buffer);
+      /* Basically a NOP.  Avoid signalling an error if the selected window
+	 is dedicated, or a minibuffer, ...  */
+      return Fset_buffer (buffer);
+    }
 
   err = no_switch_window (selected_window);
   if (err) error (err);