diff options
| author | Paul Eggert | 2012-10-10 12:53:26 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-10-10 12:53:26 -0700 |
| commit | e738ca5624ba0f3703095e0ad48b4ef7b97973bf (patch) | |
| tree | 37331f67737025667839225f18d1a129485683c0 /src | |
| parent | 29f21cdf23171eef76deee2582cf4024367220ec (diff) | |
| download | emacs-e738ca5624ba0f3703095e0ad48b4ef7b97973bf.tar.gz emacs-e738ca5624ba0f3703095e0ad48b4ef7b97973bf.zip | |
* regex.c (immediate_quit) [emacs]: Remove duplicate decl.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/regex.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 60a18e5c680..a05c426a452 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-10-10 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * regex.c (immediate_quit) [emacs]: Remove duplicate decl. | ||
| 4 | |||
| 1 | 2012-10-10 Juanma Barranquero <lekktu@gmail.com> | 5 | 2012-10-10 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * makefile.w32-in ($(BLD)/dispnew.$(O), $(BLD)/indent.$(O)) | 7 | * makefile.w32-in ($(BLD)/dispnew.$(O), $(BLD)/indent.$(O)) |
diff --git a/src/regex.c b/src/regex.c index 17562043df1..7443eff3977 100644 --- a/src/regex.c +++ b/src/regex.c | |||
| @@ -1834,7 +1834,6 @@ typedef struct | |||
| 1834 | /* Explicit quit checking is needed for Emacs, which uses polling to | 1834 | /* Explicit quit checking is needed for Emacs, which uses polling to |
| 1835 | process input events. */ | 1835 | process input events. */ |
| 1836 | #ifdef emacs | 1836 | #ifdef emacs |
| 1837 | extern int immediate_quit; | ||
| 1838 | # define IMMEDIATE_QUIT_CHECK \ | 1837 | # define IMMEDIATE_QUIT_CHECK \ |
| 1839 | do { \ | 1838 | do { \ |
| 1840 | if (immediate_quit) QUIT; \ | 1839 | if (immediate_quit) QUIT; \ |