[Emacs-diffs] /srv/bzr/emacs/trunk r108897: In quit-window always restore window height when it's saved in

[martin rudalics]

------------------------------------------------------------
revno: 108897
author: Dmitry Gutov <address@hidden>
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Fri 2012-07-06 08:22:56 +0200
message:
  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.
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-06 04:31:46 +0000
+++ b/lisp/ChangeLog    2012-07-06 06:22:56 +0000
@@ -1,3 +1,8 @@
+2012-07-06  Dmitry Gutov  <address@hidden>
+
+       * window.el (quit-window): Always restore window height when
+       it's saved in quit-restore parameter.
+
 2012-07-06  Glenn Morris  <address@hidden>
 
        * simple.el (kill-whole-line): Doc tweak.

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2012-06-22 21:24:54 +0000
+++ b/lisp/window.el    2012-07-06 06:22:56 +0000
@@ -3069,9 +3069,8 @@
           (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