[Emacs-diffs] /srv/bzr/emacs/trunk r110530: In debug restore window configuration when debugger-will-be-back is non-nil (Bug#12623).

[martin rudalics]

------------------------------------------------------------
revno: 110530
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Sat 2012-10-13 09:58:53 +0200
message:
  In debug restore window configuration when debugger-will-be-back is non-nil 
(Bug#12623).
  
  * emacs-lisp/debug.el (debug): When debugger-will-be-back is
  non-nil, restore window configuration (Bug#12623).
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/debug.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-12 20:11:50 +0000
+++ b/lisp/ChangeLog    2012-10-13 07:58:53 +0000
@@ -1,3 +1,8 @@
+2012-10-13  Martin Rudalics  <address@hidden>
+
+       * emacs-lisp/debug.el (debug): When debugger-will-be-back is
+       non-nil, restore window configuration (Bug#12623).
+
 2012-10-12  Stefan Monnier  <address@hidden>
 
        * help-fns.el (describe-variable, describe-function-1):

=== modified file 'lisp/emacs-lisp/debug.el'
--- a/lisp/emacs-lisp/debug.el  2012-10-03 07:18:50 +0000
+++ b/lisp/emacs-lisp/debug.el  2012-10-13 07:58:53 +0000
@@ -213,7 +213,8 @@
             (or enable-recursive-minibuffers (> (minibuffer-depth) 0)))
            (standard-input t) (standard-output t)
            inhibit-redisplay
-           (cursor-in-echo-area nil))
+           (cursor-in-echo-area nil)
+           (window-configuration (current-window-configuration)))
        (unwind-protect
            (save-excursion
              (when (eq (car debugger-args) 'debug)
@@ -266,16 +267,19 @@
                ;; Make sure we unbind buffer-read-only in the right buffer.
                (save-excursion
                  (recursive-edit))))
-         (when (and (not debugger-will-be-back)
-                    (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))
-           ;; Unshow debugger-buffer.
-           (quit-restore-window debugger-window debugger-bury-or-kill)
-           ;; Restore current buffer (Bug#12502).
-           (set-buffer debugger-old-buffer))
+         (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).
+               (set-buffer debugger-old-buffer))))
           ;; Restore previous state of debugger-buffer in case we were
           ;; in a recursive invocation of the debugger, otherwise just
           ;; erase the buffer and put it into fundamental mode.