summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2016-11-10 18:25:21 +0200
committerEli Zaretskii <eliz@gnu.org>2016-11-10 18:25:21 +0200
commit78aece497ce9dc784d5e3d2707d76766eed2a174 (patch)
treecc512c731d3eb74b00444024a425031c57356f6f
parenteb364fddec1431f459166cebb36f09f6b371dd71 (diff)
downloademacs-78aece497ce9dc784d5e3d2707d76766eed2a174.tar.gz
Improve documentation of 'occur'
* doc/emacs/search.texi (Other Repeating Search): Clarify how to use Occur with search strings from last Isearch. (Bug#24890)
-rw-r--r--doc/emacs/search.texi26
1 files changed, 13 insertions, 13 deletions
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index b41214df1ae..543d5470046 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -1714,15 +1714,21 @@ a multi-file incremental search is activated automatically.
@cindex mode, Occur
@cindex match (face name)
@vindex list-matching-lines-default-context-lines
+@kindex M-s o
@item M-x occur
+@itemx M-s o
Prompt for a regexp, and display a list showing each line in the
-buffer that contains a match for it. The text that matched is
-highlighted using the @code{match} face. To limit the search to part
-of the buffer, narrow to that part (@pxref{Narrowing}). A numeric
-argument @var{n} specifies that @var{n} lines of context are to be
-displayed before and after each matching line. The default number of
-context lines is specified by the variable
-@code{list-matching-lines-default-context-lines}.
+buffer that contains a match for it. If you type @kbd{M-n} at the
+prompt, you can reuse search strings from previous incremental
+searches. The text that matched is highlighted using the @code{match}
+face. To limit the search to part of the buffer, narrow to that part
+(@pxref{Narrowing}). A numeric argument @var{n} specifies that
+@var{n} lines of context are to be displayed before and after each
+matching line. The default number of context lines is specified by
+the variable @code{list-matching-lines-default-context-lines}.
+
+You can also run @kbd{M-s o} when an incremental search is active;
+this uses the current search string.
@kindex RET @r{(Occur mode)}
@kindex o @r{(Occur mode)}
@@ -1744,12 +1750,6 @@ mode.
The command @kbd{M-x list-matching-lines} is a synonym for @kbd{M-x
occur}.
-@kindex M-s o
-@item M-s o
-Run @code{occur} using the search string of the last incremental
-string search. You can also run @kbd{M-s o} when an incremental
-search is active; this uses the current search string.
-
@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