diff options
| author | Tom Tromey <tromey@redhat.com> | 2012-12-17 07:56:22 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2012-12-17 07:56:22 -0700 |
| commit | 3d6eced1ae51ffd0a782130e7c334052277e2724 (patch) | |
| tree | 5d1d2ad7cd3374f922886c4a72062511a035c168 /src/regex.c | |
| parent | bf69f522a9e135f9aa483cedd53e71e915f2bf75 (diff) | |
| parent | 7c3d167f48d6262ee4e5512aa50a07ee96bc1509 (diff) | |
| download | emacs-3d6eced1ae51ffd0a782130e7c334052277e2724.tar.gz | |
merge from trunk
Diffstat (limited to 'src/regex.c')
| -rw-r--r-- | src/regex.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/regex.c b/src/regex.c index b995538e30d..878b629fbbf 100644 --- a/src/regex.c +++ b/src/regex.c @@ -28,7 +28,7 @@ rather than at run-time, so that re_match can be reentrant. */ -/* AIX requires this to be the first thing in the file. */ +/* AIX requires this to be the first thing in the file. */ #if defined _AIX && !defined REGEX_MALLOC #pragma alloca #endif @@ -126,7 +126,6 @@ that make sense only in Emacs. */ #ifdef emacs -# include <setjmp.h> # include "lisp.h" # include "character.h" # include "buffer.h" @@ -1836,10 +1835,9 @@ typedef struct /* The next available element. */ #define COMPILE_STACK_TOP (compile_stack.stack[compile_stack.avail]) -/* Explicit quit checking is only used on NTemacs and whenever we - use polling to process input events. */ -#if defined emacs && (defined WINDOWSNT || defined SYNC_INPUT) && defined QUIT -extern int immediate_quit; +/* Explicit quit checking is needed for Emacs, which uses polling to + process input events. */ +#ifdef emacs # define IMMEDIATE_QUIT_CHECK \ do { \ if (immediate_quit) QUIT; \ |