Merge from emacs-24; up to 2012-12-08T12:11:29Z!eliz@gnu.org

This commit is contained in:
Glenn Morris 2013-01-09 00:30:21 -08:00
commit fb9f714667
42 changed files with 1332 additions and 656 deletions

View file

@ -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))