Mercurial > emacs
view msdos/sed1.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 | 376148b31b5e |
line wrap: on
line source
# -sed1.inp------------------------------------------------------------- # Configuration script for src/makefile # ---------------------------------------------------------------------- # # Copyright (C) 1993, 1994, 1995, 1996, 1997, 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. # # ---------------------------------------------------------------------- # In case src/Makefile needs to rebuild `make-doc.exe' (might happen under # Windows 95), make sure it gets built with commands that DOS # understands (one command per line). s/^#.*// s/^[ \f\t][ \f\t]*$// s/^ / / s/\.h\.in/.h-in/ s!^ \./temacs! go32 temacs! s!/bin/sh!command.com! /^MAKE *=/s/^/# / /^SHELL *=/s/^/# / /^srcdir *=/s/@[^@\n]*@/./ /^VPATH *=/s/@[^@\n]*@/./ /^CC *=/s/@[^@\n]*@/gcc/ /^CPP *=/s/@[^@\n]*@/gcc -e/ /^CFLAGS *=/s/@[^@\n]*@/-O2 -g/ /^LIBS *=/s/@[^@\n]*@// /^LIBOBJS *=/s/@[^@\n]*@// /^LN_S *=/s/@[^@\n]*@/ln -s/ /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! /^@SET_MAKE@$/s/@SET_MAKE@// /^.\${libsrc}make-docfile.*>/s!make-docfile!make-doc.exe -o ../etc/DOC! /^.\${libsrc}make-doc/s!>.*$!! /^\${libsrc}make-docfile:/c\ ${libsrc}make-doc.exe:\ cd ..\ cd lib-src\ $(MAKE) ${MFLAGS} make-docfile -W make-docfile.c\ cd ..\ cd src /^ cd \${libsrc}; \${MAKE} \${MFLAGS} make-docfile/d /\${libsrc}make-docfile/s/-docfile[ ]/-doc.exe / /^[ ]*$/d /^temacs:/s/prefix-args// /^temacs:/s/stamp-oldxmenu// /^ #/d # arch-tag: 246725c1-79de-4d03-a080-8f19329fa35e