aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2011-07-14 22:16:55 -0400
committerGlenn Morris2011-07-14 22:16:55 -0400
commita7c33da259f863536c1ec8b2c7f1043d284c1718 (patch)
tree271e1dcb0185155236a5fe5db88e3e218ec8ff0e /lisp
parentf5c7a9297ca465dbeaad4884a6de605216720691 (diff)
downloademacs-a7c33da259f863536c1ec8b2c7f1043d284c1718.tar.gz
emacs-a7c33da259f863536c1ec8b2c7f1043d284c1718.zip
* lisp/emacs-lisp/debug.el (debug): Doc fix. (Bug#8273)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/debug.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66783b9a5ed..1b3e25da8e1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-07-15 Glenn Morris <rgm@gnu.org>
2
3 * emacs-lisp/debug.el (debug): Doc fix. (Bug#8273)
4
12011-07-14 Lars Magne Ingebrigtsen <larsi@gnus.org> 52011-07-14 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * man.el (Man-fontify-manpage): Fix message when formatting the 7 * man.el (Man-fontify-manpage): Fix message when formatting the
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 2fa339e62fe..157749500e7 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -102,7 +102,7 @@ and `debugger-reenable' to temporarily disable debug-on-entry.")
102(setq debugger 'debug) 102(setq debugger 'debug)
103;;;###autoload 103;;;###autoload
104(defun debug (&rest debugger-args) 104(defun debug (&rest debugger-args)
105 "Enter debugger. To return, type \\<debugger-mode-map>`\\[debugger-continue]'. 105 "Enter debugger. \\<debugger-mode-map>`\\[debugger-continue]' returns from the debugger.
106Arguments are mainly for use when this is called from the internals 106Arguments are mainly for use when this is called from the internals
107of the evaluator. 107of the evaluator.
108 108