master 7a29f55f3a 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Po Lu]

branch: master
commit 7a29f55f3aa3b1c3a9ed94d049e2fac1694200b9
Merge: 461ac0815c 4c505203f9
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 lisp/dired-aux.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 64cdab28f9..d2bac5c467 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -3293,7 +3293,7 @@ type \\[help-command] at that time.
 
 Third arg DELIMITED (prefix arg) means replace only word-delimited matches.
 If you exit the query-replace loop (\\[keyboard-quit], RET or q), you can
-resume the query replace with the command \\[tags-loop-continue]."
+resume the query replace with the command \\[fileloop-continue]."
   (interactive
    (let ((common
          (query-replace-read-args