mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 19:31:02 -08:00
Code Issues Projects Releases Wiki Activity

In debug restore window configuration when debugger-will-be-back is non-nil (Bug#12623).

Browse source 
* emacs-lisp/debug.el (debug): When debugger-will-be-back is
non-nil, restore window configuration (Bug#12623).
This commit is contained in:
Martin Rudalics 2012-10-13 09:58:53 +02:00
parent 73f2b4abf5
commit 88ded8acca
2 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-10-13 Martin Rudalics <rudalics@gmx.at>
* emacs-lisp/debug.el (debug): When debugger-will-be-back is
non-nil, restore window configuration (Bug#12623).
2012-10-12 Stefan Monnier <monnier@iro.umontreal.ca> 2012-10-12 Stefan Monnier <monnier@iro.umontreal.ca>
* help-fns.el (describe-variable, describe-function-1): * help-fns.el (describe-variable, describe-function-1):

26
lisp/emacs-lisp/debug.el
View file

@ -213,7 +213,8 @@ first will be printed into the backtrace buffer."
(or enable-recursive-minibuffers (> (minibuffer-depth) 0))) (or enable-recursive-minibuffers (> (minibuffer-depth) 0)))
(standard-input t) (standard-output t) (standard-input t) (standard-output t)
inhibit-redisplay inhibit-redisplay
(cursor-in-echo-area nil)) (cursor-in-echo-area nil)
(window-configuration (current-window-configuration)))
(unwind-protect (unwind-protect
(save-excursion (save-excursion
(when (eq (car debugger-args) 'debug) (when (eq (car debugger-args) 'debug)
@ -266,16 +267,19 @@ first will be printed into the backtrace buffer."
;; Make sure we unbind buffer-read-only in the right buffer. ;; Make sure we unbind buffer-read-only in the right buffer.
(save-excursion (save-excursion
(recursive-edit)))) (recursive-edit))))
(when (and (not debugger-will-be-back) (if debugger-will-be-back
(window-live-p debugger-window) ;; Restore previous window configuration (Bug#12623).
(eq (window-buffer debugger-window) debugger-buffer)) (set-window-configuration window-configuration)
;; Record height of debugger window. (when (and (window-live-p debugger-window)
(setq debugger-previous-window-height (eq (window-buffer debugger-window) debugger-buffer))
(window-total-size debugger-window)) (progn
;; Unshow debugger-buffer. ;; Record height of debugger window.
(quit-restore-window debugger-window debugger-bury-or-kill) (setq debugger-previous-window-height
;; Restore current buffer (Bug#12502). (window-total-size debugger-window))
(set-buffer debugger-old-buffer)) ;; 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 ;; Restore previous state of debugger-buffer in case we were
;; in a recursive invocation of the debugger, otherwise just ;; in a recursive invocation of the debugger, otherwise just
;; erase the buffer and put it into fundamental mode. ;; erase the buffer and put it into fundamental mode.