[Emacs-diffs] /srv/bzr/emacs/trunk r110587: In debug record height of debugger window also when debugger will be back (Bug#8789).

[martin rudalics]

------------------------------------------------------------
revno: 110587
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Fri 2012-10-19 11:28:50 +0200
message:
  In debug record height of debugger window also when debugger will be back 
(Bug#8789).
  
  * emacs-lisp/debug.el (debug): Record height of debugger window
  also when debugger will be back (Bug#8789).
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/debug.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-18 19:46:18 +0000
+++ b/lisp/ChangeLog    2012-10-19 09:28:50 +0000
@@ -1,3 +1,8 @@
+2012-10-19  Martin Rudalics  <address@hidden>
+
+       * emacs-lisp/debug.el (debug): Record height of debugger window
+       also when debugger will be back (Bug#8789).
+
 2012-10-18  Chong Yidong  <address@hidden>
 
        * progmodes/gdb-mi.el (gdb-display-buffer-other-frame-action):

=== modified file 'lisp/emacs-lisp/debug.el'
--- a/lisp/emacs-lisp/debug.el  2012-10-13 07:58:53 +0000
+++ b/lisp/emacs-lisp/debug.el  2012-10-19 09:28:50 +0000
@@ -267,15 +267,17 @@
                ;; Make sure we unbind buffer-read-only in the right buffer.
                (save-excursion
                  (recursive-edit))))
+         (when (and (window-live-p debugger-window)
+                    (eq (window-buffer debugger-window) debugger-buffer))
+           ;; Record height of debugger window.
+           (setq debugger-previous-window-height
+                 (window-total-size debugger-window)))
          (if debugger-will-be-back
              ;; Restore previous window configuration (Bug#12623).
              (set-window-configuration window-configuration)
            (when (and (window-live-p debugger-window)
                       (eq (window-buffer debugger-window) debugger-buffer))
              (progn
-               ;; Record height of debugger window.
-               (setq debugger-previous-window-height
-                     (window-total-size debugger-window))
                ;; Unshow debugger-buffer.
                (quit-restore-window debugger-window debugger-bury-or-kill)
                ;; Restore current buffer (Bug#12502).