[Emacs-diffs] /srv/bzr/emacs/trunk r110085: Fix some recent changes in debug.el.

[martin rudalics]

------------------------------------------------------------
revno: 110085
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Tue 2012-09-18 09:07:13 +0200
message:
  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.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/debug.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-18 05:14:42 +0000
+++ b/lisp/ChangeLog    2012-09-18 07:07:13 +0000
@@ -1,3 +1,10 @@
+2012-09-18  Martin Rudalics  <address@hidden>
+
+       * 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  <address@hidden>
 
        * custom.el (defface): Doc fix.

=== modified file 'lisp/emacs-lisp/debug.el'
--- a/lisp/emacs-lisp/debug.el  2012-09-12 19:16:36 +0000
+++ b/lisp/emacs-lisp/debug.el  2012-09-18 07:07:13 +0000
@@ -75,9 +75,9 @@
 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 @@
                ;; 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