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.

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

diff --cc etc/NEWS
index 1cc45c3c27d6621cd0dda707572b0a54e46ba07f,e7b827f64f28673dd59b40667c5f507abc26a332..2ac7383c9c39a8e3f2408b400506d2974b7f1c17
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -1225,13 -1160,10 +1225,13 @@@ 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
+ `dired-do-find-regexp-and-replace', work similarly to `xref-find-apropos'
+ and `xref-query-replace-in-results': 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

diff --cc lisp/dired-aux.el
Simple merge

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

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