From dc2d2590b24f7e4ee648b5d073ba744fbda7a4d8 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 30 Mar 2010 19:03:08 +0300 Subject: 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. --- test/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'test/ChangeLog') diff --git a/test/ChangeLog b/test/ChangeLog index ee69172241d..87847a43ada 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2010-03-30 Juri Linkov + + * occur-testsuite.el (occur-tests): Add tests for context lines. + 2010-03-23 Juri Linkov * occur-testsuite.el: New file. -- cgit v1.2.1