From: Martin Rudalics <rudalics@gmx.at>
Date: Tue, 18 Sep 2012 07:07:13 +0000 (+0200)
Subject: Fix some recent changes in debug.el.
X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/37ab5092e96c705aff371ca6203cdcb2d2fe3cd3

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.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ed5f6af14..e8986acdd1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-18  Martin Rudalics  <rudalics@gmx.at>
+
+	* emacs-lisp/debug.el (debugger-bury-or-kill): Fix customization
+	value.
+	(debug): Don't remove debugger window when debugger is expected
+	to be back.
+
 2012-09-18  Chong Yidong  <cyd@gnu.org>
 
 	* custom.el (defface): Doc fix.
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 774b4d3d60..e002dbabe4 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