Mercurial > emacs
annotate .gitignore @ 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 | 9a2d92bd2a3e |
children | 6719c75fa3ac |
rev | line source |
---|---|
102379 | 1 autom4te.cache |
102380
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
102379
diff
changeset
|
2 makefile |
104669
9a2d92bd2a3e
Ignore all backup files.
Andreas Schwab <schwab@linux-m68k.org>
parents:
102380
diff
changeset
|
3 *~ |
102380
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
102379
diff
changeset
|
4 |
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
102379
diff
changeset
|
5 /bin/ |
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
102379
diff
changeset
|
6 /site-lisp/ |
102379 | 7 |
8 # arch-tag: 75cd3c50-1875-4814-8360-190f7de38302 |