aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2014-08-09 18:50:13 +0200
committerMartin Rudalics2014-08-09 18:50:13 +0200
commit02e0530477b2c2fc9a4c5ff05db4ec4555b272dc (patch)
tree7281dda9d4ce5d768a1f3520be1ac648ba98289d
parentc70e7e185e670b63fd46f6a1f59289816bbab098 (diff)
downloademacs-02e0530477b2c2fc9a4c5ff05db4ec4555b272dc.tar.gz
emacs-02e0530477b2c2fc9a4c5ff05db4ec4555b272dc.zip
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).
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/window.el5
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b8c538a336..91a6e41860f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12014-08-09 Martin Rudalics <rudalics@gmx.at>
2
3 * window.el (display-buffer-below-selected): Restore original
4 behavior if buffer is already displayed in the window below the
5 selected one (Bug#18181).
6
12014-08-08 Stefan Monnier <monnier@iro.umontreal.ca> 72014-08-08 Stefan Monnier <monnier@iro.umontreal.ca>
2 8
3 * mouse.el (mouse--down-1-maybe-follows-link): Don't convert the down 9 * mouse.el (mouse--down-1-maybe-follows-link): Don't convert the down
diff --git a/lisp/window.el b/lisp/window.el
index c771f01707e..09fe52dee88 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -6373,7 +6373,10 @@ again with `display-buffer-pop-up-window'."
6373This either splits the selected window or reuses the window below 6373This either splits the selected window or reuses the window below
6374the selected one." 6374the selected one."
6375 (let (window) 6375 (let (window)
6376 (or (and (not (frame-parameter nil 'unsplittable)) 6376 (or (and (setq window (window-in-direction 'below))
6377 (eq buffer (window-buffer window))
6378 (window--display-buffer buffer window 'reuse alist))
6379 (and (not (frame-parameter nil 'unsplittable))
6377 (let ((split-height-threshold 0) 6380 (let ((split-height-threshold 0)
6378 split-width-threshold) 6381 split-width-threshold)
6379 (setq window (window--try-to-split-window (selected-window) alist))) 6382 (setq window (window--try-to-split-window (selected-window) alist)))