[Emacs-diffs] /srv/bzr/emacs/trunk r106490: In Fkill_buffer do replace_buffer_in_windows before Fset_buffer. (Bug#10114)

[martin rudalics]

------------------------------------------------------------
revno: 106490
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Wed 2011-11-23 10:57:27 +0100
message:
  In Fkill_buffer do replace_buffer_in_windows before Fset_buffer.  (Bug#10114)
  
  * buffer.c (Fkill_buffer): Run replace_buffer_in_windows before
  making another buffer current.  (Bug#10114)
modified:
  src/ChangeLog
  src/buffer.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-23 07:09:27 +0000
+++ b/src/ChangeLog     2011-11-23 09:57:27 +0000
@@ -1,3 +1,8 @@
+2011-11-23  Martin Rudalics  <address@hidden>
+
+       * buffer.c (Fkill_buffer): Run replace_buffer_in_windows before
+       making another buffer current.  (Bug#10114)
+
 2011-11-23  Glenn Morris  <address@hidden>
 
        * font.c (font_find_for_lface) [HAVE_NS]: Ignore case.  (Bug#2526)

=== modified file 'src/buffer.c'
--- a/src/buffer.c      2011-11-20 03:48:53 +0000
+++ b/src/buffer.c      2011-11-23 09:57:27 +0000
@@ -1526,7 +1526,13 @@
       UNGCPRO;
     }
 
-  /* Make this buffer not be current.
+  /* Run replace_buffer_in_windows before making another buffer current
+     since set-window-buffer-start-and-point will refuse to make another
+     buffer current if the selected window does not show the current
+     buffer.  (Bug#10114) */
+  replace_buffer_in_windows (buffer);
+
+     /* Make this buffer not be current.
      In the process, notice if this is the sole visible buffer
      and give up if so.  */
   if (b == current_buffer)
@@ -1566,7 +1572,6 @@
 
   /* These may run Lisp code and into infinite loops (if someone
      insisted on circular lists) so allow quitting here.  */
-  replace_buffer_in_windows (buffer);
   frames_discard_buffer (buffer);
 
   clear_charpos_cache (b);