Mercurial > emacs
view src/prefix-args.c @ 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 | aec1143e8d85 376148b31b5e |
line wrap: on
line source
/* prefix-args.c - echo each argument, prefixed by a string. Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. GNU Emacs 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. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Jim Blandy <jimb@occs.cs.oberlin.edu> - September 1992 When using GCC 2 as the linker in the build process, options intended for the linker need to be prefixed with the "-Xlinker" option. If an option takes an argument, we need to use -Xlinker twice - once for the option and once for its argument. For example, to run the linker with the options "-Bstatic" "-e" "_start", you'd need to pass the following options to GCC: -Xlinker -Bstatic -Xlinker -e -Xlinker _start. The Emacs makefile used to use a Bourne Shell `for' loop to prefix each linker option with "-Xlinker", but 1) the for loop was hairier than one might hope because it had to work when there were no arguments to pass to the linker - the shell barfs on a loop like this: for arg in ; do echo -Xlinker "$arg"; done and 2) the whole compilation command containing this loop seems to exit with a non-zero status and halt the build under Ultrix. If I can't write a completely portable program to do this in C, I'm quitting and taking up gardening. */ #ifdef HAVE_CONFIG_H # include <config.h> #endif #if STDC_HEADERS # include <stdlib.h> /* for proper declaration of `exit' */ #endif #include <stdio.h> #include <stdlib.h> int main (argc, argv) int argc; char **argv; { char *progname; char *prefix; progname = argv[0]; argc--, argv++; if (argc < 1) { fprintf (stderr, "Usage: %s PREFIX ARGS...\n\ Echo each ARG preceded by PREFIX and a space.\n", progname); exit (2); } prefix = argv[0]; argc--, argv++; for (; argc > 0; argc--, argv++) printf ("%s %s%c", prefix, argv[0], (argc > 1) ? ' ' : '\n'); exit (0); } /* arch-tag: 08136d70-e5c0-49c7-bcd8-b4850233977a (do not change this comment) */