Mercurial > emacs
view src/atimer.h @ 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 | 81da60e75606 |
children | e16f43875a48 376148b31b5e |
line wrap: on
line source
/* Asynchronous timers. Copyright (C) 2000, 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/>. */ #ifndef EMACS_ATIMER_H #define EMACS_ATIMER_H /* Declare the prototype for a general external function. */ #if defined (PROTOTYPES) || defined (WINDOWSNT) #define P_(proto) proto #else #define P_(proto) () #endif #include "systime.h" /* for EMACS_TIME */ /* Forward declaration. */ struct atimer; /* Types of timers. */ enum atimer_type { /* Timer is ripe at some absolute time. */ ATIMER_ABSOLUTE, /* Timer is ripe at now plus an offset. */ ATIMER_RELATIVE, /* Timer runs continuously. */ ATIMER_CONTINUOUS }; /* Type of timer callback functions. */ typedef void (* atimer_callback) P_ ((struct atimer *timer)); /* Structure describing an asynchronous timer. */ struct atimer { /* The type of this timer. */ enum atimer_type type; /* Time when this timer is ripe. */ EMACS_TIME expiration; /* Interval of this timer. */ EMACS_TIME interval; /* Function to call when timer is ripe. Interrupt input is guaranteed to not be blocked when this function is called. */ atimer_callback fn; /* Additional user-specified data to pass to FN. */ void *client_data; /* Next in list of active or free atimers. */ struct atimer *next; }; /* Function prototypes. */ struct atimer *start_atimer P_ ((enum atimer_type, EMACS_TIME, atimer_callback, void *)); void cancel_atimer P_ ((struct atimer *)); void do_pending_atimers P_ ((void)); void init_atimer P_ ((void)); void turn_on_atimers P_ ((int)); void stop_other_atimers P_ ((struct atimer *)); void run_all_atimers P_ ((void)); Lisp_Object unwind_stop_other_atimers P_ ((Lisp_Object)); #endif /* EMACS_ATIMER_H */ /* arch-tag: 02c7c1c8-45bd-4222-b874-4ca44662f60b (do not change this comment) */