summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-10-10 12:53:26 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-10-10 12:53:26 -0700
commite738ca5624ba0f3703095e0ad48b4ef7b97973bf (patch)
tree37331f67737025667839225f18d1a129485683c0 /src
parent29f21cdf23171eef76deee2582cf4024367220ec (diff)
downloademacs-e738ca5624ba0f3703095e0ad48b4ef7b97973bf.tar.gz
* regex.c (immediate_quit) [emacs]: Remove duplicate decl.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/regex.c1
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 @@
+2012-10-10 Paul Eggert <eggert@cs.ucla.edu>
+
+ * regex.c (immediate_quit) [emacs]: Remove duplicate decl.
+
2012-10-10 Juanma Barranquero <lekktu@gmail.com>
* 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
/* Explicit quit checking is needed for Emacs, which uses polling to
process input events. */
#ifdef emacs
-extern int immediate_quit;
# define IMMEDIATE_QUIT_CHECK \
do { \
if (immediate_quit) QUIT; \