Mercurial > emacs
view msdos/sigaction.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 | fa41f74280f5 |
children | ef719132ddfa |
line wrap: on
line source
/* sigaction.c * * Copyright (C) 1995 DJ Delorie * * (See the README file in this directory for the copyright and license * history of this file.) * * This file 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. * * This file 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 this file. If not, see <http://www.gnu.org/licenses/>. */ #include <signal.h> #include <errno.h> int sigaction(int _sig, const struct sigaction *_act, struct sigaction *_oact) { int retval = 0; if (_oact) { void (*installed_sig)(int) = signal (_sig, SIG_IGN); /* FIXME */ if (installed_sig == SIG_ERR) { retval = -1; errno = EINVAL; } else signal (_sig, installed_sig); _oact->sa_handler = installed_sig; retval = sigemptyset (&_oact->sa_mask); _oact->sa_flags = 0; } if (_act) { if (signal (_sig, _act->sa_handler) == SIG_ERR) { retval = -1; errno = EINVAL; } } return 0; } /* arch-tag: 39526405-3d3a-44fe-af28-82a515e0c8e8 (do not change this comment) */