aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2016-11-10 18:25:21 +0200
committerEli Zaretskii2016-11-10 18:25:21 +0200
commit78aece497ce9dc784d5e3d2707d76766eed2a174 (patch)
treecc512c731d3eb74b00444024a425031c57356f6f
parenteb364fddec1431f459166cebb36f09f6b371dd71 (diff)
downloademacs-78aece497ce9dc784d5e3d2707d76766eed2a174.tar.gz
emacs-78aece497ce9dc784d5e3d2707d76766eed2a174.zip
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.
1714@cindex mode, Occur 1714@cindex mode, Occur
1715@cindex match (face name) 1715@cindex match (face name)
1716@vindex list-matching-lines-default-context-lines 1716@vindex list-matching-lines-default-context-lines
1717@kindex M-s o
1717@item M-x occur 1718@item M-x occur
1719@itemx M-s o
1718Prompt for a regexp, and display a list showing each line in the 1720Prompt for a regexp, and display a list showing each line in the
1719buffer that contains a match for it. The text that matched is 1721buffer that contains a match for it. If you type @kbd{M-n} at the
1720highlighted using the @code{match} face. To limit the search to part 1722prompt, you can reuse search strings from previous incremental
1721of the buffer, narrow to that part (@pxref{Narrowing}). A numeric 1723searches. The text that matched is highlighted using the @code{match}
1722argument @var{n} specifies that @var{n} lines of context are to be 1724face. To limit the search to part of the buffer, narrow to that part
1723displayed before and after each matching line. The default number of 1725(@pxref{Narrowing}). A numeric argument @var{n} specifies that
1724context lines is specified by the variable 1726@var{n} lines of context are to be displayed before and after each
1725@code{list-matching-lines-default-context-lines}. 1727matching line. The default number of context lines is specified by
1728the variable @code{list-matching-lines-default-context-lines}.
1729
1730You can also run @kbd{M-s o} when an incremental search is active;
1731this uses the current search string.
1726 1732
1727@kindex RET @r{(Occur mode)} 1733@kindex RET @r{(Occur mode)}
1728@kindex o @r{(Occur mode)} 1734@kindex o @r{(Occur mode)}
@@ -1744,12 +1750,6 @@ mode.
1744The command @kbd{M-x list-matching-lines} is a synonym for @kbd{M-x 1750The command @kbd{M-x list-matching-lines} is a synonym for @kbd{M-x
1745occur}. 1751occur}.
1746 1752
1747@kindex M-s o
1748@item M-s o
1749Run @code{occur} using the search string of the last incremental
1750string search. You can also run @kbd{M-s o} when an incremental
1751search is active; this uses the current search string.
1752
1753@item M-x multi-occur 1753@item M-x multi-occur
1754This command is just like @code{occur}, except it is able to search 1754This command is just like @code{occur}, except it is able to search
1755through multiple buffers. It asks you to specify the buffer names one 1755through multiple buffers. It asks you to specify the buffer names one