[Emacs-diffs] /srv/bzr/emacs/trunk r110350: In debug restore current buffer when quitting debugger window (Bug#12502).

[martin rudalics]

------------------------------------------------------------
revno: 110350
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Wed 2012-10-03 09:18:50 +0200
message:
  In debug restore current buffer when quitting debugger window (Bug#12502).
  
  * emacs-lisp/debug.el (debug): When quitting the debugger window
  restore current buffer (Bug#12502).
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/debug.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-02 15:21:47 +0000
+++ b/lisp/ChangeLog    2012-10-03 07:18:50 +0000
@@ -1,3 +1,8 @@
+2012-10-03  Martin Rudalics  <address@hidden>
+
+       * emacs-lisp/debug.el (debug): When quitting the debugger window
+       restore current buffer (Bug#12502).
+
 2012-10-02  Chong Yidong  <address@hidden>
 
        * progmodes/hideif.el (hif-lookup, hif-defined): Handle

=== modified file 'lisp/emacs-lisp/debug.el'
--- a/lisp/emacs-lisp/debug.el  2012-09-20 13:35:13 +0000
+++ b/lisp/emacs-lisp/debug.el  2012-10-03 07:18:50 +0000
@@ -273,7 +273,9 @@
            (setq debugger-previous-window-height
                  (window-total-size debugger-window))
            ;; Unshow debugger-buffer.
-           (quit-restore-window debugger-window debugger-bury-or-kill))
+           (quit-restore-window debugger-window debugger-bury-or-kill)
+           ;; Restore current buffer (Bug#12502).
+           (set-buffer debugger-old-buffer))
           ;; Restore previous state of debugger-buffer in case we were
           ;; in a recursive invocation of the debugger, otherwise just
           ;; erase the buffer and put it into fundamental mode.