aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2012-09-20 15:35:13 +0200
committerMartin Rudalics2012-09-20 15:35:13 +0200
commit96e8d4114dc9caa3ad6c03aca2129491a84b87db (patch)
tree60ffc2eff20d1a558d3814876c7dd2a6d70333b9
parent9b154e20db90fed759d85be7b7368386da251478 (diff)
downloademacs-96e8d4114dc9caa3ad6c03aca2129491a84b87db.tar.gz
emacs-96e8d4114dc9caa3ad6c03aca2129491a84b87db.zip
In debug restore assignment to debugger-old-buffer.
* emacs-lisp/debug.el (debug): Restore assignment to debugger-old-buffer removed on 2012-09-08.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/debug.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b2e0e7b1d49..932bc4342c1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-09-20 Martin Rudalics <rudalics@gmx.at>
2
3 * emacs-lisp/debug.el (debug): Restore assignment to
4 debugger-old-buffer removed on 2012-09-08.
5
12012-09-20 Juri Linkov <juri@jurta.org> 62012-09-20 Juri Linkov <juri@jurta.org>
2 7
3 * dired-aux.el (dired-diff): Remove (require 'diff) since 8 * dired-aux.el (dired-diff): Remove (require 'diff) since
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index e002dbabe49..6fd52d67b90 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -166,6 +166,7 @@ first will be printed into the backtrace buffer."
166 (with-current-buffer (get-buffer "*Backtrace*") 166 (with-current-buffer (get-buffer "*Backtrace*")
167 (list major-mode (buffer-string))))) 167 (list major-mode (buffer-string)))))
168 (debugger-buffer (get-buffer-create "*Backtrace*")) 168 (debugger-buffer (get-buffer-create "*Backtrace*"))
169 (debugger-old-buffer (current-buffer))
169 (debugger-window nil) 170 (debugger-window nil)
170 (debugger-step-after-exit nil) 171 (debugger-step-after-exit nil)
171 (debugger-will-be-back nil) 172 (debugger-will-be-back nil)