aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorPaul Eggert2016-01-30 11:28:37 -0800
committerPaul Eggert2016-01-30 11:28:37 -0800
commit1a9cec16fe8d805dbb9f3a082bebcdefb878cf13 (patch)
treed9aeebb668e61da05bbf2ef88eabc9b4f015923a /etc
parent3b71a72a777237c8ef34835a2021adc8eb5e5c7f (diff)
parent3f481ad0072ea4fe300af7f326de9049a8d32d4a (diff)
downloademacs-1a9cec16fe8d805dbb9f3a082bebcdefb878cf13.tar.gz
emacs-1a9cec16fe8d805dbb9f3a082bebcdefb878cf13.zip
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 'etc')
-rw-r--r--etc/NEWS4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 1cc45c3c27d..2ac7383c9c3 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1230,8 +1230,8 @@ viewing HTML files and the like.
1230 1230
1231*** New user interface for the `A' and `Q' commands. 1231*** New user interface for the `A' and `Q' commands.
1232These keys, now bound to `dired-do-find-regexp' and 1232These keys, now bound to `dired-do-find-regexp' and
1233`dired-do-find-regexp-and-replace', work similarly to 1233`dired-do-find-regexp-and-replace', work similarly to `xref-find-apropos'
1234`xref-find-apropos' and `xref-query-replace': they present the matches 1234and `xref-query-replace-in-results': they present the matches
1235in the `*xref*' buffer and let you move through the matches. No need 1235in the `*xref*' buffer and let you move through the matches. No need
1236to use `tags-loop-continue' to resume the search or replace loop. The 1236to use `tags-loop-continue' to resume the search or replace loop. The
1237previous commands, `dired-do-search' and 1237previous commands, `dired-do-search' and