aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/progmodes/xref.el2
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f7182d50dc..cabad65d8c7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,7 @@
6 (xref-location-marker): New method implementation. 6 (xref-location-marker): New method implementation.
7 7
8 * progmodes/xref.el: Mention that xref-location is an EIEIO class. 8 * progmodes/xref.el: Mention that xref-location is an EIEIO class.
9 (xref--insert-xrefs): Expand help-echo string.
9 10
102015-01-19 Dmitry Gutov <dgutov@yandex.ru> 112015-01-19 Dmitry Gutov <dgutov@yandex.ru>
11 12
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 536096f612f..92144cf8049 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -458,7 +458,7 @@ GROUP is a string for decoration purposes and XREF is an
458 'face 'font-lock-keyword-face 458 'face 'font-lock-keyword-face
459 'mouse-face 'highlight 459 'mouse-face 'highlight
460 'keymap xref--button-map 460 'keymap xref--button-map
461 'help-echo "mouse-2: display, RET or mouse-1: navigate") 461 'help-echo "mouse-2: display in another window, RET or mouse-1: navigate")
462 description)) 462 description))
463 (when (or more1 more2) 463 (when (or more1 more2)
464 (insert "\n"))))) 464 (insert "\n")))))