summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/trace.el8
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee55ef04858..a35b537bdb1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-09 Glenn Morris <rgm@gnu.org>
+
+ * emacs-lisp/trace.el (trace-function, trace-function-background):
+ Doc fix.
+
2013-01-09 Juri Linkov <juri@jurta.org>
* international/mule-cmds.el (read-char-by-name): Move let-binding
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index 53d849cf744..3e55b7c88fa 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -254,7 +254,9 @@ and return values will be inserted into BUFFER. This function generates the
trace advice for FUNCTION and activates it together with any other advice
there might be!! The trace BUFFER will popup whenever FUNCTION is called.
Do not use this to trace functions that switch buffers or do any other
-display oriented stuff, use `trace-function-background' instead."
+display oriented stuff, use `trace-function-background' instead.
+
+To untrace a function, use `untrace-function' or `untrace-all'."
(interactive
(list
(intern (completing-read "Trace function: " obarray 'fboundp t))
@@ -271,7 +273,9 @@ and activates it together with any other advice there might be.
The trace output goes to BUFFER quietly, without changing
the window or buffer configuration.
-BUFFER defaults to `trace-buffer'."
+BUFFER defaults to `trace-buffer'.
+
+To untrace a function, use `untrace-function' or `untrace-all'."
(interactive
(list
(intern