2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df760f20a7e..76ba2cd4c80 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-05  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/xref.el (xref--insert-xrefs): Add `help-echo' property
+        to the references.
+
 2015-01-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * minibuffer.el (completion-category-defaults): New var.
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 41b70c7eff2..b822619f783 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -434,7 +434,8 @@ GROUP is a string for decoration purposes and XREF is an
                        (list 'xref-location location
                              'face 'font-lock-keyword-face
                              'mouse-face 'highlight
-                             'keymap xref--button-map)
+                             'keymap xref--button-map
+                             'help-echo "mouse-2: display, RET or mouse-1: navigate")
                        description))
                     (when (or more1 more2)
                       (insert "\n")))))