2 files changed, 12 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ed5f6af14b..e8986acdd1f 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 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