From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 30 Jan 2016 19:28:37 +0000 (-0800)
Subject: Merge from origin/emacs-25
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/1a9cec16fe8d805dbb9f3a082bebcdefb878cf13

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.
---

1a9cec16fe8d805dbb9f3a082bebcdefb878cf13
diff --cc etc/NEWS
index 1cc45c3c27,e7b827f64f..2ac7383c9c
--- a/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