Mercurial > emacs
annotate .dir-locals.el @ 107653:bfde3c2dbef5
Make occur handle multi-line matches cleanly with context.
http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01280.html
* replace.el (occur-accumulate-lines): Add optional arg `pt'.
(occur-engine): Add local variables `ret', `prev-after-lines',
`prev-lines'. Use more arguments for `occur-context-lines'.
Set first elem of its returned list to `data', and the second elem
to `prev-after-lines'. Don't print the separator line.
In the end, print remaining context after-lines.
(occur-context-lines): Add new arguments `begpt', `endpt',
`lines', `prev-lines', `prev-after-lines'. Rewrite to combine
after-lines of the previous match with before-lines of the
current match and not overlap them. Return a list with two
values: the output line and the list of context after-lines.
* search.texi (Other Repeating Search): Remove line that `occur'
can not handle multiline matches.
* occur-testsuite.el (occur-tests): Add tests for context lines.
author | Juri Linkov <juri@jurta.org> |
---|---|
date | Tue, 30 Mar 2010 19:03:08 +0300 |
parents | 340849d761a5 |
children | 2c36d4f54456 |
rev | line source |
---|---|
101014 | 1 ((nil . ((tab-width . 8) |
100718
0a3d5993b567
Remove non-working entry for pmail.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100687
diff
changeset
|
2 (fill-column . 70))) |
100672
38e7317321ea
* make-dist (tempdir): Distribute .dir-locals.el.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff
changeset
|
3 (c-mode . ((c-file-style . "GNU"))) |
100718
0a3d5993b567
Remove non-working entry for pmail.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100687
diff
changeset
|
4 (change-log-mode . ((add-log-time-zone-rule . t) |
101158
4a6ff510dcf9
(change-log-mode): Add bug-reference-url-format and bug-reference-mode.
Juri Linkov <juri@jurta.org>
parents:
101014
diff
changeset
|
5 (fill-column . 74) |
106607
55134161b319
(bug-reference-url-format): Change to debbugs.gnu.org.
Glenn Morris <rgm@gnu.org>
parents:
105015
diff
changeset
|
6 (bug-reference-url-format . "http://debbugs.gnu.org/%s") |
107432
340849d761a5
* .dir-locals.el (c-mode): Turn on whitespace-mode for diff-mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106607
diff
changeset
|
7 (mode . bug-reference))) |
340849d761a5
* .dir-locals.el (c-mode): Turn on whitespace-mode for diff-mode.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106607
diff
changeset
|
8 (diff-mode . ((mode . whitespace)))) |
100687
245c01516a02
Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents:
100672
diff
changeset
|
9 |
245c01516a02
Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents:
100672
diff
changeset
|
10 ;; arch-tag: fb93c160-e9fe-4184-aad1-e4f5daa11cbd |