Mercurial > emacs
view msdos/sed2.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
# -sed2.inp------------------------------------------------------------- # Configuration script for src/config.h # ---------------------------------------------------------------------- # # Copyright (C) 1993, 1994, 1995, 1996, 1997, 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. # # ---------------------------------------------------------------------- /^#undef LISP_FLOAT_TYPE *$/s/undef/define/ /^#undef GNU_MALLOC *$/s/undef/define/ /^#undef REL_ALLOC *$/s/undef/define/ /^#undef HAVE_SYS_SELECT/i\ /^#undef STDC_HEADERS *$/s/undef/define/ /^#undef HAVE_SYS_TIMEB_H *$/s/undef/define/ /^#undef HAVE_SYS_TIME_H *$/s/undef/define/ # /^#undef HAVE_UNISTD_H *$/s/undef/define/ /^#undef HAVE_GETTIMEOFDAY *$/s/undef/define/ /^#undef HAVE_GETHOSTNAME *$/s/undef/define/ /^#undef HAVE_DUP2 *$/s/undef/define/ /^#undef HAVE_TM_ZONE *$/s/undef/define/ /^#undef LOCALTIME_CACHE *$/s/undef/define/ /^#undef HAVE_TZSET *$/s/undef/define/ /^#undef TM_IN_SYS_TIME *$/s/undef/define/ /^#undef TIME_WITH_SYS_TIME *$/s/undef/define/ /^#undef HAVE_RENAME *$/s/undef/define/ /^#undef HAVE_CLOSEDIR *$/s/undef/define/ /^#undef HAVE_RANDOM *$/s/undef/define/ /^#undef HAVE_MKDIR *$/s/undef/define/ /^#undef HAVE_RMDIR *$/s/undef/define/ /^#undef HAVE_BCMP *$/s/undef/define/ /^#undef HAVE_BCOPY *$/s/undef/define/ /^#undef HAVE_FREXP *$/s/undef/define/ /^#undef HAVE_FTIME *$/s/undef/define/ /^#undef HAVE_MKTIME *$/s/undef/define/ /^#undef HAVE_STRERROR *$/s/undef/define/ /^#undef HAVE_TIMEVAL *$/s/undef/define/ s/^#define USER_FULL_NAME .*$/#define USER_FULL_NAME (getenv ("NAME"))/ s/^#undef STACK_DIRECTION *$/#define STACK_DIRECTION -1/ s/^#undef EMACS_CONFIGURATION *$/#define EMACS_CONFIGURATION "i386-pc-msdosdjgpp"/ s/^#undef EMACS_CONFIG_OPTIONS *$/#define EMACS_CONFIG_OPTIONS "-"/ s!^#undef config_opsysfile *$!#define config_opsysfile "s/msdos.h"! s!^#undef config_machfile *$!#define config_machfile "m/intel386.h"! s/^#undef PROTOTYPES *$/#define PROTOTYPES 1/ s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/ # arch-tag: 31840234-109a-41ab-a675-7a3844978299