summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/trace.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2010-03-24 14:02:56 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2010-03-24 14:02:56 -0400
commite867cb5d30200dd696b012e1ad0964d25c2a7ecc (patch)
tree3340026420f168909eaa734232e4890e15bc1626 /lisp/emacs-lisp/trace.el
parentb2b8574b8d03673f5673e2154d17c2cb80f59a0b (diff)
parentefee6a6d9cec2af824b8355c93d8f47b72a685a8 (diff)
downloademacs-e867cb5d30200dd696b012e1ad0964d25c2a7ecc.tar.gz
emacs-e867cb5d30200dd696b012e1ad0964d25c2a7ecc.tar.bz2
emacs-e867cb5d30200dd696b012e1ad0964d25c2a7ecc.zip
Merge from `emacs-23'.
Diffstat (limited to 'lisp/emacs-lisp/trace.el')
-rw-r--r--lisp/emacs-lisp/trace.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index 9b143cbf18c..194afe10815 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -253,7 +253,7 @@
For every call of FUNCTION Lisp-style trace messages that display argument
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.
+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."
(interactive