]> code.delx.au - gnu-emacs/commitdiff
Fix last fix in `display-buffer-record-window'.
authorMartin Rudalics <rudalics@gmx.at>
Wed, 22 Apr 2015 13:02:22 +0000 (15:02 +0200)
committerMartin Rudalics <rudalics@gmx.at>
Wed, 22 Apr 2015 13:02:22 +0000 (15:02 +0200)
* lisp/window.el (display-buffer-record-window): Fix last fix.

lisp/window.el

index 07e477d7799568f52df173bdb0699b11da69dfa5..32467c393dd0797306e0104d2072fbf7b89343fb 100644 (file)
@@ -5481,7 +5481,8 @@ element is BUFFER."
            (setcar quit-restore 'same)
            ;; The selected-window might have changed in
            ;; between (Bug#20353).
-           (unless (memq (selected-window) '(window (nth 2 quit-restore)))
+           (unless (or (eq window (selected-window))
+                        (eq window (nth 2 quit-restore)))
              (setcar (cddr quit-restore) (selected-window)))))
       ;; WINDOW shows another buffer.
       (with-current-buffer (window-buffer window)