* emacs-lisp/trace.el (trace-function, trace-function-background): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee55ef04858d459a50b3264a7bef25629f4046c8..a35b537bdb1e315febd592ff45c17a9a280f120d 100644 (file)
--- 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 53d849cf7440e947c2c19a77a50ce3c79d884d5d..3e55b7c88fa426e2bec960d84ee6a0b0aaa21893 100644 (file)
--- 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