Improve documentation of 'occur'

* doc/emacs/search.texi (Other Repeating Search):
* lisp/replace.el (occur): Make the documentation of 'occur' be
more accurate when matches overlap.  (Bug#27818)
This commit is contained in:
Eli Zaretskii 2017-07-29 11:25:29 +03:00
parent a00083cede
commit d3fcb92413
2 changed files with 9 additions and 0 deletions

View file

@ -1747,6 +1747,10 @@ at the first match after such line.
You can also run @kbd{M-s o} when an incremental search is active;
this uses the current search string.
Note that matches for the regexp you type are extended to include
complete lines, and a match that starts before the previous match ends
is not considered a match.
@kindex RET @r{(Occur mode)}
@kindex o @r{(Occur mode)}
@kindex C-o @r{(Occur mode)}

View file

@ -1395,6 +1395,11 @@ invoke `occur'."
"Show all lines in the current buffer containing a match for REGEXP.
If a match spreads across multiple lines, all those lines are shown.
Each match is extended to include complete lines. Only non-overlapping
matches are considered. (Note that extending matches to complete
lines could cause some of the matches to overlap; if so, they will not
be shown as separate matches.)
Each line is displayed with NLINES lines before and after, or -NLINES
before if NLINES is negative.
NLINES defaults to `list-matching-lines-default-context-lines'.