Merge branch 'master' into xwidget

2 files changed, 28 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aa79a8d4b2e..f413526c0b2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-04  Dmitry Gutov  <dgutov@yandex.ru>
+
+        Add mouse interaction to xref.
+
+        * progmodes/xref.el (xref--button-map): New variable.
+        (xref--mouse-2): New command.
+        (xref--insert-xrefs): Add `mouse-face' and `keymap' properties to
+        the inserted references.
+
 2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         Less 'make' chatter for lisp dir
@@ -1903,7 +1912,7 @@
 2014-11-18  Paul Eggert  <eggert@cs.ucla.edu>
 
         Port new time stamp handling to Emacs 23.2.
-        This fix is for Gnus.  Problem reported by Katsumi Yamaoka.
+        This fix is for Gnus.  Reported by Katsumi Yamaoka.
         * calendar/time-date.el (time-add, time-subtract, time-less-p):
         Use eval-and-compile, not eval-when-compile.
 
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 7bc6500a8de..41b70c7eff2 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -405,6 +405,21 @@ WINDOW controls how the buffer is displayed:
 (defconst xref-buffer-name "*xref*"
   "The name of the buffer to show xrefs.")
 
+(defvar xref--button-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map [(control ?m)] #'xref-goto-xref)
+    (define-key map [mouse-1] #'xref-goto-xref)
+    (define-key map [mouse-2] #'xref--mouse-2)
+    map))
+
+(defun xref--mouse-2 (event)
+  "Move point to the button and show the xref definition."
+  (interactive "e")
+  (mouse-set-point event)
+  (forward-line 0)
+  (xref--search-property 'xref-location)
+  (xref-show-location-at-point))
+
 (defun xref--insert-xrefs (xref-alist)
   "Insert XREF-ALIST in the current-buffer.
 XREF-ALIST is of the form ((GROUP . (XREF ...)) ...).  Where
@@ -417,7 +432,9 @@ GROUP is a string for decoration purposes and XREF is an
                     (with-slots (description location) xref
                       (xref--insert-propertized
                        (list 'xref-location location
-                             'face 'font-lock-keyword-face)
+                             'face 'font-lock-keyword-face
+                             'mouse-face 'highlight
+                             'keymap xref--button-map)
                        description))
                     (when (or more1 more2)
                       (insert "\n")))))