From: Dmitry Gutov <dgutov@yandex.ru>
Date: Fri, 6 Jul 2012 06:22:56 +0000 (+0200)
Subject: In quit-window always restore window height when it's saved in
X-Git-Tag: emacs-24.2.90~1199^2~190
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4737eec9d737a2d374454095f9400b24769af39c;p=emacs.git

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 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