summaryrefslogtreecommitdiff
path: root/lisp/profiler.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-08-05 14:10:30 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-08-05 14:10:30 -0700
commitc1b5000d8c484d7acd39414119838c78eaaf9cca (patch)
treee179d9a26228aea7f586365f52eb9ec81bdcd856 /lisp/profiler.el
parentfe3225830d0817d3d7eee1dfb92e0deec641c9c5 (diff)
parentd841a03c5ee3e9a59a133474601f9bda190ee8fa (diff)
downloademacs-c1b5000d8c484d7acd39414119838c78eaaf9cca.tar.gz
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 'lisp/profiler.el')
-rw-r--r--lisp/profiler.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/profiler.el b/lisp/profiler.el
index 2aff99986a1..dac42fec0c7 100644
--- a/lisp/profiler.el
+++ b/lisp/profiler.el
@@ -693,7 +693,8 @@ With a prefix argument, expand the whole subtree."
(defun profiler-report-toggle-entry (&optional arg)
"Expand entry at point if the tree is collapsed,
-otherwise collapse."
+otherwise collapse. With prefix argument, expand all subentries
+below entry at point."
(interactive "P")
(or (profiler-report-expand-entry arg)
(profiler-report-collapse-entry)))