[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111155: * emacs-lisp/trace.el (trace-function, trace-function-background): Doc fix.

[Glenn Morris]

------------------------------------------------------------
revno: 111155
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2013-01-08 19:59:10 -0800
message:
  * emacs-lisp/trace.el (trace-function, trace-function-background): Doc fix.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/trace.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-09 00:20:02 +0000
+++ b/lisp/ChangeLog    2013-01-09 03:59:10 +0000
@@ -1,3 +1,8 @@
+2013-01-09  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/trace.el (trace-function, trace-function-background):
+       Doc fix.
+
 2013-01-09  Juri Linkov  <address@hidden>
 
        * international/mule-cmds.el (read-char-by-name): Move let-binding

=== modified file 'lisp/emacs-lisp/trace.el'
--- a/lisp/emacs-lisp/trace.el  2013-01-01 09:11:05 +0000
+++ b/lisp/emacs-lisp/trace.el  2013-01-09 03:59:10 +0000
@@ -254,7 +254,9 @@
 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 @@
 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