aboutsummaryrefslogtreecommitdiffstats
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 @@
12012-10-27 Eli Zaretskii <eliz@gnu.org>
2
3 * profiler.el (profiler-report-make-entry-part): Fix help-echo
4 text to match the real keybindings.
5
12012-10-27 Juri Linkov <juri@jurta.org> 62012-10-27 Juri Linkov <juri@jurta.org>
2 7
3 * wdired.el (wdired-keep-marker-rename): New defcustom. 8 * 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.")
353 (propertize (symbol-name entry) 353 (propertize (symbol-name entry)
354 'face 'link 354 'face 'link
355 'mouse-face 'highlight 355 'mouse-face 'highlight
356 'help-echo "mouse-2 or RET jumps to definition")) 356 'help-echo "\
357mouse-2: jump to definition\n\
358RET: expand or collapse"))
357 (t 359 (t
358 (profiler-format-entry entry))))) 360 (profiler-format-entry entry)))))
359 (propertize string 'profiler-entry entry))) 361 (propertize string 'profiler-entry entry)))