[Emacs-diffs] /srv/bzr/emacs/trunk r106270: In quit-window call unrecord-window-buffer later. (Bug#9937)

[martin rudalics]

------------------------------------------------------------
revno: 106270
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Wed 2011-11-02 10:39:18 +0100
message:
  In quit-window call unrecord-window-buffer later.  (Bug#9937)
  
  * window.el (quit-window): Call unrecord-window-buffer after
  showing another buffer in the window.  (Bug#9937)
  (bury-buffer): Call switch-to-prev-buffer with second argument
  'bury.
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-11-02 02:05:53 +0000
+++ b/lisp/ChangeLog    2011-11-02 09:39:18 +0000
@@ -1,3 +1,10 @@
+2011-11-02  Martin Rudalics  <address@hidden>
+
+       * window.el (quit-window): Call unrecord-window-buffer after
+       showing another buffer in the window.  (Bug#9937)
+       (bury-buffer): Call switch-to-prev-buffer with second argument
+       'bury.
+
 2011-11-02  Juanma Barranquero  <address@hidden>
 
        * vc/vc-bzr.el (vc-bzr-state, vc-bzr-after-dir-status):

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-10-30 08:29:56 +0000
+++ b/lisp/window.el    2011-11-02 09:39:18 +0000
@@ -2852,7 +2852,7 @@
      (t
       ;; Switch to another buffer in window.
       (set-window-dedicated-p nil nil)
-      (switch-to-prev-buffer nil 'kill)))
+      (switch-to-prev-buffer nil 'bury)))
 
     ;; Always return nil.
     nil))
@@ -2985,7 +2985,6 @@
       (setq resize (with-current-buffer buffer
                     (and temp-buffer-resize-mode
                          (/= (nth 3 quad) (window-total-size window)))))
-      (unrecord-window-buffer window buffer)
       (set-window-dedicated-p window nil)
       (when resize
        ;; Try to resize WINDOW to its old height but don't signal an
@@ -2993,9 +2992,12 @@
        (condition-case nil
            (window-resize window (- (nth 3 quad) (window-total-size window)))
          (error nil)))
-      ;; Restore WINDOW's previous buffer, window start and point.
+      ;; Restore WINDOW's previous buffer, start and point position.
       (set-window-buffer-start-and-point
        window (nth 0 quad) (nth 1 quad) (nth 2 quad))
+      ;; Unrecord WINDOW's buffer here (Bug#9937) to make sure it's not
+      ;; re-recorded by `set-window-buffer'.
+      (unrecord-window-buffer window buffer)
       ;; Reset the quit-restore parameter.
       (set-window-parameter window 'quit-restore nil)
       ;; Select old window.