aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2014-06-03 14:38:17 +0200
committerMartin Rudalics2014-06-03 14:38:17 +0200
commit4a52a98a9a5a49719da0a44d5ab1ddfde9a2aedc (patch)
tree2526006b867ada6298832ea64d9ecf8789560806
parent0016fa11a71bff9c8e70a98723cefc1582389dff (diff)
downloademacs-4a52a98a9a5a49719da0a44d5ab1ddfde9a2aedc.tar.gz
emacs-4a52a98a9a5a49719da0a44d5ab1ddfde9a2aedc.zip
In display-buffer-use-some-window don't shrink window used (Bug#17671).
* window.el (display-buffer-use-some-window): Don't make window used smaller than it was before (Bug#17671).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/window.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2ca78add203..6bb2147595d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-06-03 Martin Rudalics <rudalics@gmx.at>
2
3 * window.el (display-buffer-use-some-window): Don't make window
4 used smaller than it was before (Bug#17671).
5
12014-06-03 Eli Zaretskii <eliz@gnu.org> 62014-06-03 Eli Zaretskii <eliz@gnu.org>
2 7
3 * menu-bar.el (menu-bar-open): Fix last change: use the PC 8 * menu-bar.el (menu-bar-open): Fix last change: use the PC
diff --git a/lisp/window.el b/lisp/window.el
index c5093ca51a5..e9f4fd0b1d2 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -6497,7 +6497,7 @@ that frame."
6497 ;; resize it to its old height but don't signal an error. 6497 ;; resize it to its old height but don't signal an error.
6498 (when (and (listp quad) 6498 (when (and (listp quad)
6499 (integerp (nth 3 quad)) 6499 (integerp (nth 3 quad))
6500 (/= (nth 3 quad) (window-total-height window))) 6500 (> (nth 3 quad) (window-total-height window)))
6501 (condition-case nil 6501 (condition-case nil
6502 (window-resize window (- (nth 3 quad) (window-total-height window))) 6502 (window-resize window (- (nth 3 quad) (window-total-height window)))
6503 (error nil))) 6503 (error nil)))