-

diff --cc doc/emacs/dired.texi
Simple merge

diff --cc etc/NEWS
index 4a370a9c80962b2cc5509f6848a3531395d1979f,048523acae34681229419481270e28e846465749..1cc45c3c27d6621cd0dda707572b0a54e46ba07f
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -1213,9 -1160,17 +1225,20 @@@ compression command is determined from 
  `dired-compress-files-alist' variable.
  
  +++
 +*** `W' is now bound to `browse-url-of-dired-file', and is useful for
 +viewing HTML files and the like.
 +
+ *** New user interface for the `A' and `Q' commands.
+ These keys, now bound to `dired-do-find-regexp' and
+ `dired-do-find-regexp-and-replace', work similarly to
+ `xref-find-apropos' and `xref-query-replace': they present the matches
+ in the `*xref*' buffer and let you move through the matches.  No need
+ to use `tags-loop-continue' to resume the search or replace loop.  The
+ previous commands, `dired-do-search' and
+ `dired-do-query-replace-regexp', are still available, but not bound to
+ keys; rebind `A' and `Q' to invoke them if you want the old behavior
+ back.  We intend to obsolete the old commands in a future release.
+ 
  ** Tabulated List Mode
  
  +++

diff --cc lisp/progmodes/cc-engine.el
Simple merge

diff --cc lisp/textmodes/reftex-ref.el
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/sysdep.c
Simple merge

diff --cc src/window.c
Simple merge