diff options
| author | Vibhav Pant <vibhavp@gmail.com> | 2017-01-30 18:35:43 +0530 |
|---|---|---|
| committer | Vibhav Pant <vibhavp@gmail.com> | 2017-01-30 18:35:43 +0530 |
| commit | bf7f7c0d82a56ed1b76358657e74ca2833b19fe2 (patch) | |
| tree | 90f357b4a735ca7c90d1881ef9948186b9f919df /src/regex.c | |
| parent | 25d38a06eceb0853190a2d9acf53d85686f524bd (diff) | |
| parent | 9c4dfdd1af9f97c6a8d7e922b68a39052116790c (diff) | |
| download | emacs-bf7f7c0d82a56ed1b76358657e74ca2833b19fe2.tar.gz emacs-bf7f7c0d82a56ed1b76358657e74ca2833b19fe2.tar.bz2 emacs-bf7f7c0d82a56ed1b76358657e74ca2833b19fe2.zip | |
Merge remote-tracking branch 'origin/master' into feature/byte-switch
Diffstat (limited to 'src/regex.c')
| -rw-r--r-- | src/regex.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/regex.c b/src/regex.c index db3f0c16a2d..f6e67afef4c 100644 --- a/src/regex.c +++ b/src/regex.c @@ -1729,12 +1729,9 @@ typedef struct /* 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; \ - } while (0) +# define IMMEDIATE_QUIT_CHECK (immediate_quit ? maybe_quit () : (void) 0) #else -# define IMMEDIATE_QUIT_CHECK ((void)0) +# define IMMEDIATE_QUIT_CHECK ((void) 0) #endif /* Structure to manage work area for range table. */ |