Rename xref-select-and-{goto,show}-xref

* lisp/progmodes/xref.el (xref-select-and-show-xref):
Rename from xref-select-and-goto-xref (bug#35376).
Update all references.

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index d17c6d3e757aeb696cea2363694b2269b34acf14..8c5d19dcddf7ec7ce53039520b0ea3b5cdded6e3 100644 (file)
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -2229,7 +2229,7 @@ With prefix argument, also bury the @file{*xref*} buffer.
 @item mouse-2
 The same as @code{mouse-1}, but make the window displaying the
 @file{*xref*} buffer the selected window
-(@code{xref-select-and-goto-xref}).
+(@code{xref-select-and-show-xref}).
 
 @item n
 @itemx .

diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index d495a4e2926127dc1856d594e048a84348feccbd..9045f941b13f8ee172f4912840450c6b25410567 100644 (file)
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -898,10 +898,10 @@ beginning of the line."
 (defvar xref--button-map
   (let ((map (make-sparse-keymap)))
     (define-key map [mouse-1] #'xref-goto-xref)
-    (define-key map [mouse-2] #'xref-select-and-goto-xref)
+    (define-key map [mouse-2] #'xref-select-and-show-xref)
     map))
 
-(defun xref-select-and-goto-xref (event)
+(defun xref-select-and-show-xref (event)
   "Move point to the button and show the xref definition.
 The window showing the xref buffer will be selected."
   (interactive "e")
@@ -910,8 +910,9 @@ The window showing the xref buffer will be selected."
   (or (get-text-property (point) 'xref-item)
       (xref--search-property 'xref-item))
   (xref-show-location-at-point))
+
 (define-obsolete-function-alias
-  'xref--mouse-2 #'xref-select-and-goto-xref "28.1")
+  'xref--mouse-2 #'xref-select-and-show-xref "28.1")
 
 (defcustom xref-truncation-width 400
   "The column to visually \"truncate\" each Xref buffer line to."