Rename xref-query-replace to xref-query-replace-in-results

* lisp/progmodes/xref.el(xref-query-replace):
Rename to xref-query-replace-in-results.
(http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01240.html)

* lisp/progmodes/xref.el (xref--xref-buffer-mode-map):
* lisp/dired-aux.el (dired-do-find-regexp-and-replace):
* doc/emacs/dired.texi (Operating on Files):
* doc/emacs/maintaining.texi (Xref Commands)
(Identifier Search, Identifier Search): Update accordingly.

2 files changed, 4 insertions, 4 deletions

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 831278cb762..ef1f3871175 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -2714,7 +2714,7 @@ with the command \\[tags-loop-continue]."
                       '(dired-get-marked-files nil nil 'dired-nondirectory-p)))
 
 (declare-function xref--show-xrefs "xref")
-(declare-function xref-query-replace "xref")
+(declare-function xref-query-replace-in-results "xref")
 
 ;;;###autoload
 (defun dired-do-find-regexp (regexp)
@@ -2746,7 +2746,7 @@ with the command \\[tags-loop-continue]."
            "Query replace regexp in marked files" t t)))
      (list (nth 0 common) (nth 1 common))))
   (with-current-buffer (dired-do-find-regexp from)
-    (xref-query-replace from to)))
+    (xref-query-replace-in-results from to)))
 
 (defun dired-nondirectory-p (file)
   (not (file-directory-p file)))
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index b7ac9e02e9f..267853d1642 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -502,7 +502,7 @@ WINDOW controls how the buffer is displayed:
     (xref-quit)
     (xref--pop-to-location xref window)))
 
-(defun xref-query-replace (from to)
+(defun xref-query-replace-in-results (from to)
   "Perform interactive replacement of FROM with TO in all displayed xrefs.
 
 This command interactively replaces FROM with TO in the names of the
@@ -589,7 +589,7 @@ references displayed in the current *xref* buffer."
     (define-key map [remap quit-window] #'xref-quit)
     (define-key map (kbd "n") #'xref-next-line)
     (define-key map (kbd "p") #'xref-prev-line)
-    (define-key map (kbd "r") #'xref-query-replace)
+    (define-key map (kbd "r") #'xref-query-replace-in-results)
     (define-key map (kbd "RET") #'xref-goto-xref)
     (define-key map (kbd "C-o") #'xref-show-location-at-point)
     ;; suggested by Johan Claesson "to further reduce finger movement":