aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/replace.el
diff options
context:
space:
mode:
authorKen Raeburn2017-07-31 01:13:53 -0400
committerKen Raeburn2017-07-31 01:13:53 -0400
commit13f3370400031e2ac1c9be0932f411370fc6984e (patch)
tree06f349b2b0f1cda9e36f7c4390d9d2d9bf49303c /lisp/replace.el
parentcd0966b33c1fe975520e85e0e7af82c09e4754dc (diff)
parentdcfcaf40d577808d640016c886d4fae7280a7fd5 (diff)
downloademacs-scratch/raeburn-startup.tar.gz
emacs-scratch/raeburn-startup.zip
; Merge from branch 'master'scratch/raeburn-startup
Diffstat (limited to 'lisp/replace.el')
-rw-r--r--lisp/replace.el5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/replace.el b/lisp/replace.el
index 64dfe7da22d..a5024943e64 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1395,6 +1395,11 @@ invoke `occur'."
1395 "Show all lines in the current buffer containing a match for REGEXP. 1395 "Show all lines in the current buffer containing a match for REGEXP.
1396If a match spreads across multiple lines, all those lines are shown. 1396If a match spreads across multiple lines, all those lines are shown.
1397 1397
1398Each match is extended to include complete lines. Only non-overlapping
1399matches are considered. (Note that extending matches to complete
1400lines could cause some of the matches to overlap; if so, they will not
1401be shown as separate matches.)
1402
1398Each line is displayed with NLINES lines before and after, or -NLINES 1403Each line is displayed with NLINES lines before and after, or -NLINES
1399before if NLINES is negative. 1404before if NLINES is negative.
1400NLINES defaults to `list-matching-lines-default-context-lines'. 1405NLINES defaults to `list-matching-lines-default-context-lines'.