Mercurial > emacs
view nextstep/FOR-RELEASE @ 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 | fe774839a58c |
children |
line wrap: on
line source
-*- outline -*- * CURSOR BUGS: ** (mouse-avoidance-mode 'banish) then minimize Emacs, will pop window back up on top of all others * OTHER BUGS ** free_frame_resources, face colors ** numeric keysetting bug ** http://debbugs.gnu.org/ns * MAC-RELATED: ** open file:/// URLs ** put frame autopositioning into C code somewhere -- if loc = same, offset ** automap ctrl-mouse-1 to mouse-3 ** deal with Finder aliases somehow ** Ctrl-F2 won't pull up menus * OTHER / LOW PRIORITY: ** better recog of unicode scripts / Greek / composition ** Exec-dump not working on GNUstep (so slow startup). ** undo for color-drag face customization