Commit cb581a67 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/emacs-lisp/debug.el (debug): Don't leave the buffer in Debugger.

parent 0ac30604
2011-06-15 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/debug.el (debug): Don't leave the buffer in Debugger.
* abbrev.el (define-abbrev-table): Don't add a table multiple times.
2011-06-15 Alan Mackenzie <acm@muc.de>
* progmodes/cc-fonts.el (c-font-lock-declarations): 1: Whilst
checking for declarators, disable knr checking to speed up for
normal files. 2: Refactor, replacing a sequence of nested if
forms by a cond form.
* progmodes/cc-fonts.el (c-font-lock-declarations): 1: Whilst checking
for declarators, disable knr checking to speed up for normal files.
2: Refactor, replacing a sequence of nested if forms by a cond form.
2011-06-15 Lars Magne Ingebrigtsen <larsi@gnus.org>
......
......@@ -238,13 +238,14 @@ first will be printed into the backtrace buffer."
(kill-buffer debugger-buffer)))
;; Restore the previous state of the debugger-buffer, in case we were
;; in a recursive invocation of the debugger.
(when (and debugger-previous-state
(buffer-live-p debugger-buffer))
(when (buffer-live-p debugger-buffer)
(with-current-buffer debugger-buffer
(let ((inhibit-read-only t))
(erase-buffer)
(insert (nth 1 debugger-previous-state))
(funcall (nth 0 debugger-previous-state)))))
(if (null debugger-previous-state)
(fundamental-mode)
(insert (nth 1 debugger-previous-state))
(funcall (nth 0 debugger-previous-state))))))
(with-timeout-unsuspend debugger-with-timeout-suspend)
(set-match-data debugger-outer-match-data)))
;; Put into effect the modified values of these variables
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment