From: Dmitry Gutov <dgutov@yandex.ru>
Date: Thu, 22 Apr 2021 21:18:01 +0000 (+0300)
Subject: Remove the binding for xref-quit-and-goto-xref
X-Git-Tag: emacs-28.0.90~2770
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=522c34f0e80f60969861b0dc34bc7105249f9994;p=emacs.git

Remove the binding for xref-quit-and-goto-xref

* lisp/progmodes/xref.el (xref--xref-buffer-mode-map):
Remove the binding for xref-quit-and-goto-xref (bug#44611).

* doc/emacs/maintaining.texi (Xref Commands): Update.
---

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index dfe4eb0ea30..32f5cb9a439 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -2242,10 +2242,9 @@ display it in the other window (@code{xref-prev-group}).
 Display the reference on the current line in the other window
 (@code{xref-show-location-at-point}).
 
-@item @key{TAB}
-@findex xref-quit-and-goto-xref
-Display the reference on the current line and bury the @file{*xref*}
-buffer (@code{xref-quit-and-goto-xref}).
+@kindex C-u RET
+To bury the @file{*xref*} buffer before displaying the reference, call
+@code{xref-goto-xref} with a prefix argument: @kbd{C-u RET}.
 
 @item r @var{pattern} @key{RET} @var{replacement} @key{RET}
 Perform interactive query-replace on references that match
diff --git a/etc/NEWS b/etc/NEWS
index e7258f19b46..6fe4e98a50a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1644,11 +1644,19 @@ in 'project-list-file'.
 
 ** xref
 
----
++++
 *** Prefix arg of 'xref-goto-xref' quits the "*xref*" buffer.
 So typing 'C-u RET' in the "*xref*" buffer quits its window
 before navigating to the selected location.
 
++++
+*** The TAB binding in *xref* buffers has been removed. Use 'C-u RET' instead.
+To restore the old binding, say something like:
+
+    (require 'xref)
+    (define-key xref--xref-buffer-mode-map
+                (kbd "TAB") #'xref-quit-and-goto-xref)
+
 *** New user options 'xref-search-program' and 'xref-search-program-alist'.
 So far 'grep' and 'ripgrep' are supported.  'ripgrep' seems to offer better
 performance in certain cases, in particular for case-insensitive
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 5d99915347b..5f1c32b212c 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -822,7 +822,6 @@ ITEMS is an xref item which "
     (define-key map (kbd "P") #'xref-prev-group)
     (define-key map (kbd "r") #'xref-query-replace-in-results)
     (define-key map (kbd "RET") #'xref-goto-xref)
-    (define-key map (kbd "TAB")  #'xref-quit-and-goto-xref)
     (define-key map (kbd "C-o") #'xref-show-location-at-point)
     ;; suggested by Johan Claesson "to further reduce finger movement":
     (define-key map (kbd ".") #'xref-next-line)