Mention xref-quit-and-pop-marker-stack in the manual

* doc/emacs/maintaining.texi (Xref Commands): Mention
xref-quit-and-pop-marker-stack in the manual.

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 4ee0f32bd5b0c4df392a9c1a94483e6dc7ac557a..b692c995513f56bb25250dcd9fcfa3ceeaf93c10 100644 (file)
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -2280,6 +2280,11 @@ the match with @var{replacement}.  @xref{Identifier Search}.
 Refresh the contents of the @file{*xref*} buffer
 (@code{xref-revert-buffer}.
 
+@item M-,
+@findex xref-quit-and-pop-marker-stack
+Quit the window showing the @file{*xref*} buffer, and then jump to the
+previous Xref stack location (@code{xref-quit-and-pop-marker-stack}.
+
 @item q
 @findex xref-quit
 Quit the window showing the @file{*xref*} buffer (@code{xref-quit}).

diff --git a/etc/NEWS b/etc/NEWS
index e99b119e4f0a2e1f906e45f49785796b30cfae5d..fd2408d7933284db0038d8fd94eff6ab60bd47ae 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2436,10 +2436,12 @@ have been renamed to have "proper" public names and documented
 ('xref-show-definitions-buffer' and
 'xref-show-definitions-buffer-at-bottom').
 
-*** New command 'xref-quit-and-pop-marker-stack' and a binding for it
-in "*xref*" buffers ('M-,').  This combination is easy to press
-semi-accidentally if the user wants to go back in the middle of
-choosing the exact definition to go to, and this should do TRT.
++++
+*** New command 'xref-quit-and-pop-marker-stack'.
+This command is bound to 'M-,' in "*xref*" buffers.  This combination
+is easy to press semi-accidentally if the user wants to go back in the
+middle of choosing the exact definition to go to, and this should do
+TRT.
 
 ---
 *** New value 'project-relative' for 'xref-file-name-display'.
@@ -2458,6 +2460,7 @@ binding in 'xref--xref-buffer-mode-map'.
 When non-nil, matches for identifiers in the file visited by the
 current buffer will be shown first in the "*xref*" buffer.
 
++++
 *** The etags Xref backend now honors 'tags-apropos-additional-actions'.
 You can customize it to augment the output of 'xref-find-apropos',
 like it affected the output of 'tags-apropos', which is obsolete since
@@ -2710,6 +2713,7 @@ The 'erc-current-nick-highlight-type', 'erc-pal-highlight-type',
 'erc-dangerous-host-highlight-type' variables now support a 'message'
 type for highlighting the entire message but not the sender's nick.
 
+---
 *** erc-status-sidebar.el is now part of ERC.
 The 'erc-status-sidebar' package which provides a HexChat-like
 activity overview sidebar for joined IRC channels is now part of ERC.