; Fix last change.

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 671d4dd42257b7d61bb2a51f1c55010e638618ed..ad4a3ea35062d973d9ff2d2dbcd72d7359fabddf 100644 (file)
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -2338,7 +2338,7 @@ them.
 @item M-?
 Find all the references for the identifier at point.
 
-@item r@r{, Xref command}
+@item r
 @itemx M-x xref-query-replace-in-results @key{RET} @var{replacement} @key{RET}
 @itemx C-u M-x xref-query-replace-in-results @key{RET} @var{regexp} @key{RET} @var{replacement} @key{RET}
 Interactively replace @var{regexp} with @var{replacement} in the names

diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 47b4b3d15c84a9a3888c8c89ece6074e1f5531c3..afb4509913986f43f4e17c51cb30a46122e0bf5a 100644 (file)
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -897,7 +897,8 @@ ITEMS is an xref item which " ; FIXME: Expand documentation.
       (setq continue
             (perform-replace from to t t nil nil multi-query-replace-map)))
     (unless did-it-once
-      (user-error "Cannot use subset of matches for global renaming"))
+      (user-error
+       "Cannot use subset of matches of identifier for global renaming"))
     (when (and continue (not buf-pairs))
       (message "All results processed"))))