summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/trace.el
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-04-25 22:22:16 +0100
committerAndrea Corallo <akrl@sdf.org>2020-04-25 22:22:16 +0100
commit2878624980a116550e8b07acc76a24c373eab342 (patch)
tree040a73d3b4d4c94ae2f52f83232b60a8bffa2a4f /lisp/emacs-lisp/trace.el
parent64af8f941fb7ec50460f47997109e757cb7af94c (diff)
parent519567878fa32715aa377d1fa23240f09ce291f6 (diff)
downloademacs-2878624980a116550e8b07acc76a24c373eab342.tar.gz
emacs-2878624980a116550e8b07acc76a24c373eab342.tar.bz2
emacs-2878624980a116550e8b07acc76a24c373eab342.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/trace.el')
-rw-r--r--lisp/emacs-lisp/trace.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index 5c35036a50d..4ebb7ff711d 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -292,7 +292,9 @@ If `current-prefix-arg' is non-nil, also read a buffer and a \"context\"
(defun trace-function-foreground (function &optional buffer context)
"Trace calls to function FUNCTION.
With a prefix argument, also prompt for the trace buffer (default
-`trace-buffer'), and a Lisp expression CONTEXT.
+`trace-buffer'), and a Lisp expression CONTEXT. When called from
+Lisp, CONTEXT should be a function of no arguments which returns
+a value to insert into BUFFER during the trace.
Tracing a function causes every call to that function to insert
into BUFFER Lisp-style trace messages that display the function's