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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a745669d75405a1c65c186ccf37cce6e3edd25e9..482bb7ec489d16ebeb192aaae0a486797374652c 100644 (file)
--- 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 b362f40d8adca812c111d9392843c1fb217742c6..f9adf84fc58c36dbbee71c76ec6010f94aa7c979 100644 (file)
--- 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