Mercurial > emacs
view msdos/sedleim.inp @ 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 | 1d1d5d9bd884 |
children | ce960720ed3f 376148b31b5e |
line wrap: on
line source
# -sedleim.inp----------------------------------------------------------- # Configuration script for leim/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # # This file is free software; as a special exception, the author gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # # ---------------------------------------------------------------------- /^SHELL *=/c\ SHELL=/xyzzy/command\ MAKESHELL=/xyzzy/command /^version=/d /^prefix=/d /^datadir=/s|@datadir@|../..| /^srcdir=/s|srcdir=@srcdir@|srcdir := $(subst \\,/,$(shell cd))| /^INSTALLDIR=/c\ INSTALLDIR=. /touch stamp-subdir/s|touch|djecho "stamp-subdir" >| s|\([ ]\)echo|\1djecho|g /^ @true *$/d /RUN-EMACS *=/,/^$/c\ export EMACSLOADPATH=${buildlisppath}\ RUN-EMACS = ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte /^ cd ../c\ ${MAKE} -C ../src ${MFLAGS} emacs /else make quail/c\ if not exist quail\\nul make quail /if \[ -f $@ \]\; then true/d /fi$/s/; fi$// /^leim-list.el:/,/^$/ { /^ if/d /^ else/,/^ fi/d s| *| | /^ --eval/,/; \\$/s|\; \\|| } /^install:/,/^$/c\ install: all\ /^ if test -f/d /^distclean:/,/^$/ { s|\(rm -f Makefile\)|\1 stamp-subdir| } # arch-tag: 33c5eed1-78bc-4a6e-9d11-cbc7c541b763