diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2012-07-06 08:22:56 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2012-07-06 08:22:56 +0200 |
| commit | 4737eec9d737a2d374454095f9400b24769af39c (patch) | |
| tree | 23929dc81442838d03a5dcf3e4e1cff7cb65b739 | |
| parent | 657924ff58fc22a6e57dc8366a20dadf97324c63 (diff) | |
| download | emacs-4737eec9d737a2d374454095f9400b24769af39c.tar.gz emacs-4737eec9d737a2d374454095f9400b24769af39c.tar.bz2 emacs-4737eec9d737a2d374454095f9400b24769af39c.zip | |
In quit-window always restore window height when it's saved in
quit-restore parameter.
* window.el (quit-window): Always restore window height when
it's saved in quit-restore parameter.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/window.el | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a745669d754..482bb7ec489 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-07-06 Dmitry Gutov <dgutov@yandex.ru> + + * window.el (quit-window): Always restore window height when + it's saved in quit-restore parameter. + 2012-07-06 Glenn Morris <rgm@gnu.org> * simple.el (kill-whole-line): Doc tweak. diff --git a/lisp/window.el b/lisp/window.el index b362f40d8ad..f9adf84fc58 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -3069,9 +3069,8 @@ one. If non-nil, reset `quit-restore' parameter to nil." (buffer-live-p (car quad)) (eq (nth 3 quit-restore) buffer)) ;; Show another buffer stored in quit-restore parameter. - (setq resize (with-current-buffer buffer - (and temp-buffer-resize-mode - (/= (nth 3 quad) (window-total-size window))))) + (setq resize (and (integerp (nth 3 quad)) + (/= (nth 3 quad) (window-total-size window)))) (set-window-dedicated-p window nil) (when resize ;; Try to resize WINDOW to its old height but don't signal an |