1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-22 20:42:26 -08:00
emacs/etc
Juri Linkov dc2d2590b2 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.
2010-03-30 19:03:08 +03:00
..
charsets Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
e * term.el (term-handle-ansi-escape): Add comments with the 2009-08-07 07:04:02 +00:00
gnus Synch with Gnus trunk 2010-03-23 07:29:49 +00:00
images Update Custom arrow images. 2010-03-12 16:42:05 -05:00
nxml
refcards Fix orgcard.tex pdf landscape format. 2010-03-04 19:01:38 -08:00
schema Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
srecode Update some cedet template copyrights to GPLv3+. 2010-03-05 19:06:37 -08:00
tutorials Minor TUTORIAL fixes. 2010-02-25 20:35:34 -08:00
.arch-inventory
.gitignore Add arch tagline 2009-03-04 06:02:06 +00:00
AUTHORS Bump version to 23.1.93; regenerate AUTHORS. 2010-02-26 22:09:45 -05:00
BABYL Add an introductory comment. 2009-01-26 02:48:23 +00:00
celibacy.1
CENSORSHIP
ChangeLog Initial support for bidirectional editing. 2010-03-30 05:13:07 -04:00
compilation.txt Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
condom.1
CONTRIBUTE CONTRIBUTE: Various minor updates and changes. 2010-02-17 21:39:06 -08:00
COOKIES
COPYING
copying.paper
DEBUG Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
DEVEL.HUMOR
DISTRIB Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
echo.msg
edt-user.el Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
emacs-buffer.gdb Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
emacs.bash Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
emacs.csh Comment that emacs.bash/csh are obsolete. 2008-10-30 04:37:40 +00:00
emacs.desktop
emacs.icon
emacs.py
emacs2.py Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
emacs3.py Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
enriched.doc Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
ERC-NEWS Fix typos in ChangeLogs and NEWS files. 2010-01-14 19:29:36 +01:00
ETAGS.EBNF Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
ETAGS.README Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
forms-d2.dat
FTP
future-bug
GNU Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
GNUS-NEWS Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
gnus-tut.txt Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
grep.txt Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
HELLO Support MS-Windows build and reversed rows in GUI frames; add initial docs. 2010-03-29 08:26:24 -04:00
INTERVIEW
JOKES
LINUX-GNU
MACHINES Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
MAILINGLISTS Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
MH-E-NEWS Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
MORE.STUFF Remove CEDET entry in MORE.STUFF. 2010-03-15 11:45:03 +01:00
MOTIVATION
ms-kermit
NEWS Initial support for bidirectional editing. 2010-03-30 05:13:07 -04:00
NEWS.1-17 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
NEWS.18 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
NEWS.19 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
NEWS.20 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
NEWS.21 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
NEWS.22 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
NEWS.23 Merge from `emacs-23'. 2010-03-24 14:02:56 -04:00
NXML-NEWS
ORDERS Update some URLs. 2009-12-15 03:12:44 +00:00
PROBLEMS Document Bug#5541. 2010-03-19 11:15:27 -04:00
ps-prin0.ps Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
ps-prin1.ps Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
README Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
rgb.txt
SERVICE
ses-example.ses Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
sex.6
spook.lines
TERMS Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
THE-GNU-PROJECT
TODO Make occur handle multi-line matches cleanly with context. 2010-03-30 19:03:08 +03:00
WHY-FREE
yow.lines

This directory contains the architecture-independent files used by or
with Emacs.  This includes some text files of documentation for GNU
Emacs or of interest to Emacs users, and the file of dumped docstrings
for Emacs functions and variables.

`forms-d2.dat' is an example data file used by forms-d2.el.

COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES

File: emacs.icon
  Author: Sun Microsystems, Inc
  Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
  License: GNU General Public License version 3 or later (see COPYING)