Mercurial > emacs
annotate .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 |
rev | line source |
---|---|
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
1 ./bin |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
2 ./BIN |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
3 ./data |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
4 ./etc/icons |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
5 ./lock |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
6 ./site-lisp |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
7 ./_dir-locals.el |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
8 ./config.log |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
9 ./config.status |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
10 oo |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
11 oo-spd |
106654 | 12 autom4te.cache |
13 *.elc | |
106809
5cb0f4fd512e
* .bzrignore: Ignore all .exe, instead of individual files.
Juanma Barranquero <lekktu@gmail.com>
parents:
106705
diff
changeset
|
14 *.exe |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
15 DOC |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
16 DOC-* |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
17 makefile |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
18 Makefile |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
19 Makefile.c |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
20 stamp_BLD |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
21 subdirs.el |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
22 TAGS |
107066
3b5ef09ea743
* .bzrignore: Add TAGS-LISP.
Juri Linkov <juri@jurta.org>
parents:
106972
diff
changeset
|
23 TAGS-LISP |
106654 | 24 info/* |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
25 leim/leim-list.el |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
26 leim/quail/*.el |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
27 leim/changed.misc |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
28 leim/changed.tit |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
29 lib-src/ctags.c |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
30 lib-src/echolisp.tmp |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
31 lib-src/getopt.h |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
32 lib-src/b2m |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
33 lib-src/ctags |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
34 lib-src/digest-doc |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
35 lib-src/ebrowse |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
36 lib-src/emacsclient |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
37 lib-src/etags |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
38 lib-src/fakemail |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
39 lib-src/hexl |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
40 lib-src/make-docfile |
106705
a7854ddcdd85
.bzrignore: Add 2 more patterns.
Eli Zaretskii <eliz@gnu.org>
parents:
106704
diff
changeset
|
41 lib-src/movemail |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
42 lib-src/profile |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
43 lib-src/sorted-doc |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
44 lib-src/test-distrib |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
45 lib-src/update-game-score |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
46 lisp/**/*-loaddefs.el |
106654 | 47 lisp/**/loaddefs.el |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
48 lisp/cus-load.el |
106654 | 49 lisp/eshell/esh-groups.el |
106658
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
50 lisp/finder-inf.el |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
51 nt/config.log |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
52 src/buildobj.h |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
53 src/config.h |
178ed92dd073
Update .bzrignore.
Juanma Barranquero <lekktu@gmail.com>
parents:
106654
diff
changeset
|
54 src/epaths.h |
106704
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
55 src/_dbxinit |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
56 src/_gdbinit |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
57 src/gdb.ini |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
58 src/bootstrap-emacs |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
59 src/emacs |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
60 src/emacs-* |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
61 src/prefix-args* |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
62 src/stamp-oldxmenu |
59aa4ddce41b
.bzrignore: Add more ignored patterns, including for the MS-DOS build.
Eli Zaretskii <eliz@gnu.org>
parents:
106666
diff
changeset
|
63 src/temacs |
106705
a7854ddcdd85
.bzrignore: Add 2 more patterns.
Eli Zaretskii <eliz@gnu.org>
parents:
106704
diff
changeset
|
64 src/deps |
106972
d026329addd9
* keymap.c (shadow_lookup): Add `remap' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106809
diff
changeset
|
65 configure.lineno |
107539
693207d4182a
Ignore tempfiles of the configure script
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107066
diff
changeset
|
66 conftest* |
693207d4182a
Ignore tempfiles of the configure script
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
107066
diff
changeset
|
67 confdefs.h |