summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2012-09-18 09:07:13 +0200
committerMartin Rudalics <rudalics@gmx.at>2012-09-18 09:07:13 +0200
commit37ab5092e96c705aff371ca6203cdcb2d2fe3cd3 (patch)
treef2a64bc3eee76dcbe0c272b034fb2bc4c50043ee /lisp/emacs-lisp
parented1f0bd388e83e5ee065f7dde0f52bbfe9031933 (diff)
downloademacs-37ab5092e96c705aff371ca6203cdcb2d2fe3cd3.tar.gz
emacs-37ab5092e96c705aff371ca6203cdcb2d2fe3cd3.tar.bz2
emacs-37ab5092e96c705aff371ca6203cdcb2d2fe3cd3.zip
Fix some recent changes in debug.el.
* emacs-lisp/debug.el (debugger-bury-or-kill): Fix customization value. (debug): Don't remove debugger window when debugger is expected to be back.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/debug.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 774b4d3d600..e002dbabe49 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -75,9 +75,9 @@ window previously showing the debugger buffer.
The value used here is passed to `quit-restore-window'."
:type '(choice
(const :tag "Keep alive" nil)
- (const :tag "Append" 'append)
- (const :tag "Bury" 'bury)
- (const :tag "Kill" 'kill))
+ (const :tag "Append" append)
+ (const :tag "Bury" bury)
+ (const :tag "Kill" kill))
:group 'debugger
:version "24.2")
@@ -265,7 +265,8 @@ first will be printed into the backtrace buffer."
;; Make sure we unbind buffer-read-only in the right buffer.
(save-excursion
(recursive-edit))))
- (when (and (window-live-p debugger-window)
+ (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