diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:10:30 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:10:30 -0700 |
| commit | c1b5000d8c484d7acd39414119838c78eaaf9cca (patch) | |
| tree | e179d9a26228aea7f586365f52eb9ec81bdcd856 /doc | |
| parent | fe3225830d0817d3d7eee1dfb92e0deec641c9c5 (diff) | |
| parent | d841a03c5ee3e9a59a133474601f9bda190ee8fa (diff) | |
Merge from origin/emacs-25
d841a03 ; Spelling fix
a6ae479 Post AppDefined events from the main thread ONLY (bug#23934)
d35d398 Update to the AUTHORS file for Bob Weiner
4d2f4df Revert "Fix local printer set to left aligned string formatter."
cd1b4d6 Revert "Fix ses-delete-blanks to delete only blanks + documen...
f7ceb8e Revert "Fix English."
baa7abd Improve doc strings of 'gud-gdb' and 'gdb'
aa4271a Fix doc string of 'minibuffer-message-timeout'
b275cc7 Fix English.
3c97b0f Fix ses-delete-blanks to delete only blanks + documentation.
272391f profiler: document prefix arg for tree expansion
442cc39 Clarify usage of eshell-visual-options
b443c3c Fix comment in files-in-below-directory
8a38e94 Fix local printer set to left aligned string formatter.
0f0b191 ; Fix typos in NEWS
6bdf687 ; * etc/NEWS: Remove temporary marks
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/debugging.texi | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 10162b3546..86c8da0e46 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -15465,7 +15465,7 @@ Here is the function: @group (cond ;; check to see whether filename ends in '.el' - ;; and if so, append its name to a list. + ;; and if so, add its name to a list. ((equal ".el" (substring (car (car current-directory-list)) -3)) (setq el-files-list (cons (car (car current-directory-list)) el-files-list))) diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi index 98c47052cb..2f83b4040f 100644 --- a/doc/lispref/debugging.texi +++ b/doc/lispref/debugging.texi @@ -840,8 +840,9 @@ called, followed by how much resource (processor or memory) it used in absolute and percentage times since profiling started. If a given line has a @samp{+} symbol at the left-hand side, you can expand that line by typing @key{RET}, in order to see the function(s) called by -the higher-level function. Pressing @key{RET} again will collapse -back to the original state. +the higher-level function. Use a prefix argument (@key{C-u RET}) to +see the whole call tree below a function. Pressing @key{RET} again +will collapse back to the original state. Press @kbd{j} or @kbd{mouse-2} to jump to the definition of a function. Press @kbd{d} to view a function's documentation. |