[Emacs-diffs] master 702aeca: In `window--display-buffer' fix behavior reported in Bug#25946

[Stephen Berman]

branch: master
commit 702aecac26accb6afb65c5482f76b3666573d9d2
Author: martin rudalics <address@hidden>
Commit: Stephen Berman <address@hidden>

    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)
---
 lisp/window.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/window.el b/lisp/window.el
index 358d7bc..5050243 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)))