Mercurial > emacs
view .bzrignore @ 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 | 693207d4182a |
children | 0a321c28c1b4 |
line wrap: on
line source
./bin ./BIN ./data ./etc/icons ./lock ./site-lisp ./_dir-locals.el ./config.log ./config.status oo oo-spd autom4te.cache *.elc *.exe DOC DOC-* makefile Makefile Makefile.c stamp_BLD subdirs.el TAGS TAGS-LISP info/* leim/leim-list.el leim/quail/*.el leim/changed.misc leim/changed.tit lib-src/ctags.c lib-src/echolisp.tmp lib-src/getopt.h lib-src/b2m lib-src/ctags lib-src/digest-doc lib-src/ebrowse lib-src/emacsclient lib-src/etags lib-src/fakemail lib-src/hexl lib-src/make-docfile lib-src/movemail lib-src/profile lib-src/sorted-doc lib-src/test-distrib lib-src/update-game-score lisp/**/*-loaddefs.el lisp/**/loaddefs.el lisp/cus-load.el lisp/eshell/esh-groups.el lisp/finder-inf.el nt/config.log src/buildobj.h src/config.h src/epaths.h src/_dbxinit src/_gdbinit src/gdb.ini src/bootstrap-emacs src/emacs src/emacs-* src/prefix-args* src/stamp-oldxmenu src/temacs src/deps configure.lineno conftest* confdefs.h