aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/debug.el6
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0207a4f903f..d7f86f510c5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-11-11 Glenn Morris <rgm@gnu.org> 12012-11-11 Glenn Morris <rgm@gnu.org>
2 2
3 * emacs-lisp/debug.el (debugger-bury-or-kill): Doc tweak.
4
3 * help.el (temp-buffer-max-height): 5 * help.el (temp-buffer-max-height):
4 * window.el (fit-frame-to-buffer, fit-frame-to-buffer-bottom-margin): 6 * window.el (fit-frame-to-buffer, fit-frame-to-buffer-bottom-margin):
5 * emacs-lisp/debug.el (debugger-bury-or-kill): Fix :version. 7 * emacs-lisp/debug.el (debugger-bury-or-kill): Fix :version.
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 1117d11e07e..6be30fc9164 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -49,9 +49,9 @@ the middle is discarded, and just the beginning and end are displayed."
49 :version "21.1") 49 :version "21.1")
50 50
51(defcustom debugger-bury-or-kill 'bury 51(defcustom debugger-bury-or-kill 'bury
52 "How to proceed with the debugger buffer when exiting `debug'. 52 "What to do with the debugger buffer when exiting `debug'.
53The value used here affects the behavior of operations on any 53The value affects the behavior of operations on any window
54window previously showing the debugger buffer. 54previously showing the debugger buffer.
55 55
56`nil' means that if its window is not deleted when exiting the 56`nil' means that if its window is not deleted when exiting the
57 debugger, invoking `switch-to-prev-buffer' will usually show 57 debugger, invoking `switch-to-prev-buffer' will usually show