[Emacs-diffs] emacs-24 r117435: In display-buffer-below-selected reuse window below selected if it shows buffer already (Bug#18181).

[Martin Rudalics]

------------------------------------------------------------
revno: 117435
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-08-09 18:50:13 +0200
message:
  In display-buffer-below-selected reuse window below selected if it shows 
buffer already (Bug#18181).
  
  * window.el (display-buffer-below-selected): Restore original
  behavior if buffer is already displayed in the window below the
  selected one (Bug#18181).
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/window.el                 window.el-20091113204419-o5vbwnq5f7feedwu-94

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-08-08 16:56:50 +0000
+++ b/lisp/ChangeLog    2014-08-09 16:50:13 +0000
@@ -1,3 +1,9 @@
+2014-08-09  Martin Rudalics  <address@hidden>
+
+       * window.el (display-buffer-below-selected): Restore original
+       behavior if buffer is already displayed in the window below the
+       selected one (Bug#18181).
+
 2014-08-08  Stefan Monnier  <address@hidden>
 
        * mouse.el (mouse--down-1-maybe-follows-link): Don't convert the down

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2014-07-27 13:01:07 +0000
+++ b/lisp/window.el    2014-08-09 16:50:13 +0000
@@ -6373,7 +6373,10 @@
 This either splits the selected window or reuses the window below
 the selected one."
   (let (window)
-    (or (and (not (frame-parameter nil 'unsplittable))
+    (or (and (setq window (window-in-direction 'below))
+            (eq buffer (window-buffer window))
+            (window--display-buffer buffer window 'reuse alist))
+       (and (not (frame-parameter nil 'unsplittable))
             (let ((split-height-threshold 0)
                   split-width-threshold)
               (setq window (window--try-to-split-window (selected-window) 
alist)))