From: martin rudalics <rudalics@gmx.at>
Date: Sun, 5 Mar 2017 11:26:26 +0000 (+0100)
Subject: In `window--display-buffer' fix behavior reported in Bug#25946
X-Git-Tag: emacs-26.0.90~642
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=702aecac26accb6afb65c5482f76b3666573d9d2;p=emacs.git

In `window--display-buffer' fix behavior reported in Bug#25946

* lisp/window.el (window--display-buffer): Set the dedicated
status of the window used and clear its history of previous
buffers also for the case that the window already shows the
buffer to be displayed.  (Bug#25946)
---

diff --git a/lisp/window.el b/lisp/window.el
index 358d7bc58f0..505024342ed 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -6643,11 +6643,11 @@ live."
     (display-buffer-record-window type window buffer)
     (unless (eq buffer (window-buffer window))
       (set-window-dedicated-p window nil)
-      (set-window-buffer window buffer)
-      (when dedicated
-	(set-window-dedicated-p window dedicated))
-      (when (memq type '(window frame))
-	(set-window-prev-buffers window nil)))
+      (set-window-buffer window buffer))
+    (when dedicated
+      (set-window-dedicated-p window dedicated))
+    (when (memq type '(window frame))
+      (set-window-prev-buffers window nil))
     (let ((quit-restore (window-parameter window 'quit-restore))
 	  (height (cdr (assq 'window-height alist)))
 	  (width (cdr (assq 'window-width alist)))