[Emacs-diffs] /srv/bzr/emacs/trunk r104452: * debug.el (debug): Restore the previous content of the

[Stefan Monnier]

------------------------------------------------------------
revno: 104452
author: Helmut Eller <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2011-05-31 12:24:33 -0300
message:
  * debug.el (debug): Restore the previous content of the
  *Backtrace* buffer when we exit with C-M-c.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/debug.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-31 03:03:38 +0000
+++ b/lisp/ChangeLog    2011-05-31 15:24:33 +0000
@@ -1,3 +1,8 @@
+2011-05-31  Helmut Eller  <address@hidden>
+
+       * debug.el (debug): Restore the previous content of the
+       *Backtrace* buffer when we exit with C-M-c.
+
 2011-05-31  Stefan Monnier  <address@hidden>
 
        * minibuffer.el: Add metadata method to completion tables.

=== modified file 'lisp/emacs-lisp/debug.el'
--- a/lisp/emacs-lisp/debug.el  2011-03-20 03:53:45 +0000
+++ b/lisp/emacs-lisp/debug.el  2011-05-31 15:24:33 +0000
@@ -120,6 +120,7 @@
          (debug-on-quit nil)
          (debugger-buffer (get-buffer-create "*Backtrace*"))
          (debugger-old-buffer (current-buffer))
+         (debugger-previous-contents nil)
          (debugger-step-after-exit nil)
           (debugger-will-be-back nil)
          ;; Don't keep reading from an executing kbd macro!
@@ -181,6 +182,7 @@
                  (when (eq 'lambda (car-safe (cadr (backtrace-frame 4))))
                    (backtrace-debug 5 t)))
                 (pop-to-buffer debugger-buffer)
+               (setq debugger-previous-contents (buffer-string))
                (debugger-mode)
                (debugger-setup-buffer debugger-args)
                (when noninteractive
@@ -215,6 +217,7 @@
              ;; erase it (and maybe hide it) but keep it alive.
              (with-current-buffer debugger-buffer
                (erase-buffer)
+               (insert debugger-previous-contents)
                (fundamental-mode)
                (with-selected-window (get-buffer-window debugger-buffer 0)
                   (when (and (window-dedicated-p (selected-window))