Mercurial > emacs
diff doc/emacs/ChangeLog @ 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 | babfb0a156a1 |
| children | 6db4a0b4404d |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Tue Mar 30 18:44:50 2010 +0300 +++ b/doc/emacs/ChangeLog Tue Mar 30 19:03:08 2010 +0300 @@ -1,3 +1,8 @@ +2010-03-30 Juri Linkov <juri@jurta.org> + + * search.texi (Other Repeating Search): Remove line that `occur' + can not handle multiline matches. + 2010-03-30 Eli Zaretskii <eliz@gnu.org> * mule.texi (International): Mention support of bidirectional editing.