diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-01-09 00:30:21 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-01-09 00:30:21 -0800 |
| commit | fb9f7146677ca0d6f03ca88dd8cd39bc3733682d (patch) | |
| tree | b143c50ce4497c0a4b518ce859fc7b93eadf3f88 /lisp/emacs-lisp | |
| parent | 454fa9b7ea69d459d65643e7bae84b3a95dce44e (diff) | |
| parent | ebb965fcf860516c7ec8de351cda8d18811283c1 (diff) | |
| download | emacs-fb9f7146677ca0d6f03ca88dd8cd39bc3733682d.tar.gz emacs-fb9f7146677ca0d6f03ca88dd8cd39bc3733682d.tar.bz2 emacs-fb9f7146677ca0d6f03ca88dd8cd39bc3733682d.zip | |
Merge from emacs-24; up to 2012-12-08T12:11:29Z!eliz@gnu.org
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/trace.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el index dc876ba0f07..7a9eb3e1b28 100644 --- a/lisp/emacs-lisp/trace.el +++ b/lisp/emacs-lisp/trace.el @@ -266,7 +266,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 (trace--read-args "Trace function: ")) (trace-function-internal function buffer nil context)) @@ -280,7 +282,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 (trace--read-args "Trace function in background: ")) (trace-function-internal function buffer t context)) |