summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/profiler.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6e940ba0fa..d7349617d58 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-27 Eli Zaretskii <eliz@gnu.org>
+
+ * profiler.el (profiler-report-make-entry-part): Fix help-echo
+ text to match the real keybindings.
+
2012-10-27 Juri Linkov <juri@jurta.org>
* wdired.el (wdired-keep-marker-rename): New defcustom.
diff --git a/lisp/profiler.el b/lisp/profiler.el
index e9261eb1af7..38c0c0b83a7 100644
--- a/lisp/profiler.el
+++ b/lisp/profiler.el
@@ -353,7 +353,9 @@ this variable directly.")
(propertize (symbol-name entry)
'face 'link
'mouse-face 'highlight
- 'help-echo "mouse-2 or RET jumps to definition"))
+ 'help-echo "\
+mouse-2: jump to definition\n\
+RET: expand or collapse"))
(t
(profiler-format-entry entry)))))
(propertize string 'profiler-entry entry)))