From: Martin Rudalics <rudalics@gmx.at>
Date: Wed, 22 Apr 2015 13:02:22 +0000 (+0200)
Subject: Fix last fix in `display-buffer-record-window'.
X-Git-Tag: emacs-25.0.90~2328
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7793db6a762112944ab05b1c03884632bd9d91cc;p=emacs.git

Fix last fix in `display-buffer-record-window'.

* lisp/window.el (display-buffer-record-window): Fix last fix.
---

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)