summaryrefslogtreecommitdiff
path: root/lisp/window.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/window.el')
-rw-r--r--lisp/window.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/window.el b/lisp/window.el
index 07e477d7799..32467c393dd 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -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)