summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/maintaining.texi4
-rw-r--r--doc/emacs/search.texi23
2 files changed, 17 insertions, 10 deletions
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 39b71445941..7f91991daa3 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1918,8 +1918,8 @@ without displaying the references.
@node Identifier Search
@subsubsection Searching and Replacing with Identifiers
-@cindex search and replace in multiple files
-@cindex multiple-file search and replace
+@cindex search and replace in multiple source files
+@cindex multiple source file search and replace
The commands in this section perform various search and replace
operations either on identifiers themselves or on files that reference
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index 9f7e9a12cd7..63cc1c24374 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -1685,15 +1685,10 @@ Aside from @code{multi-occur} and @code{multi-occur-in-matching-buffers},
which always search the whole buffer, all operate on the text from point
to the end of the buffer, or on the region if it is active.
-@findex list-matching-lines
-@findex occur
-@findex multi-occur
-@findex multi-occur-in-matching-buffers
-@findex how-many
-@findex flush-lines
-@findex keep-lines
-
@table @kbd
+@findex multi-isearch-buffers
+@cindex isearch multiple buffers
+@cindex multiple-buffer isearch
@item M-x multi-isearch-buffers
Prompt for one or more buffer names, ending with @key{RET}; then,
begin a multi-buffer incremental search in those buffers. (If the
@@ -1702,10 +1697,14 @@ next specified buffer, and so forth.) With a prefix argument, prompt
for a regexp and begin a multi-buffer incremental search in buffers
matching that regexp.
+@findex multi-isearch-buffers-regexp
@item M-x multi-isearch-buffers-regexp
This command is just like @code{multi-isearch-buffers}, except it
performs an incremental regexp search.
+@findex multi-isearch-files
+@cindex isearch multiple files
+@cindex multiple-file isearch
@item M-x multi-isearch-files
Prompt for one or more file names, ending with @key{RET}; then,
begin a multi-file incremental search in those files. (If the
@@ -1714,6 +1713,7 @@ next specified file, and so forth.) With a prefix argument, prompt
for a regexp and begin a multi-file incremental search in files
matching that regexp.
+@findex multi-isearch-files-regexp
@item M-x multi-isearch-files-regexp
This command is just like @code{multi-isearch-files}, except it
performs an incremental regexp search.
@@ -1729,6 +1729,7 @@ a multi-file incremental search is activated automatically.
@vindex list-matching-lines-jump-to-current-line
@cindex list-matching-lines-current-line-face (face name)
@kindex M-s o
+@findex occur
@item M-x occur
@itemx M-s o
Prompt for a regexp, and display a list showing each line in the
@@ -1768,25 +1769,30 @@ mode, in which edits made to the entries are also applied to the text
in the originating buffer. Type @kbd{C-c C-c} to return to Occur
mode.
+@findex list-matching-lines
The command @kbd{M-x list-matching-lines} is a synonym for @kbd{M-x
occur}.
+@findex multi-occur
@item M-x multi-occur
This command is just like @code{occur}, except it is able to search
through multiple buffers. It asks you to specify the buffer names one
by one.
+@findex multi-occur-in-matching-buffers
@item M-x multi-occur-in-matching-buffers
This command is similar to @code{multi-occur}, except the buffers to
search are specified by a regular expression that matches visited file
names. With a prefix argument, it uses the regular expression to
match buffer names instead.
+@findex how-many
@item M-x how-many
Prompt for a regexp, and print the number of matches for it in the
buffer after point. If the region is active, this operates on the
region instead.
+@findex flush-lines
@item M-x flush-lines
Prompt for a regexp, and delete each line that contains a match for
it, operating on the text after point. This command deletes the
@@ -1800,6 +1806,7 @@ lines. It deletes the lines before starting to look for the next
match; hence, it ignores a match starting on the same line at which
another match ended.
+@findex keep-lines
@item M-x keep-lines
Prompt for a regexp, and delete each line that @emph{does not} contain
a match for it, operating on the text after point. If point is not at