diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-30 11:28:37 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-30 11:28:37 -0800 |
| commit | 1a9cec16fe8d805dbb9f3a082bebcdefb878cf13 (patch) | |
| tree | d9aeebb668e61da05bbf2ef88eabc9b4f015923a /lisp/dired-aux.el | |
| parent | 3b71a72a777237c8ef34835a2021adc8eb5e5c7f (diff) | |
| parent | 3f481ad0072ea4fe300af7f326de9049a8d32d4a (diff) | |
| download | emacs-1a9cec16fe8d805dbb9f3a082bebcdefb878cf13.tar.gz | |
Merge from origin/emacs-25
3f481ad Rename xref-query-replace to xref-query-replace-in-results
62f4ed4 Update cl-defgeneric and cl-defmethod docstrings
2111e0e Comment out next-error-function integration in xref
4e11ad3 Correct a use of "which" in intro.texi
a1865bc Distinguish the two meanings of Java's keyword "default". Fixes bug #22358.
76045f7 Don't operate on menu bar of nonexistent frame
c32f3bc Unbreak the GNUstep build.
Diffstat (limited to 'lisp/dired-aux.el')
| -rw-r--r-- | lisp/dired-aux.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index ab10edeedbf..9bcb1f94b56 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))) |