aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-10-09 23:39:16 -0700
committerPaul Eggert2012-10-09 23:39:16 -0700
commit77e344e50a6ce7f211a7d820f87e2ab58093709d (patch)
tree7d4787c22be9aa937d9fd0bd83e21bc7058f102a /src
parentd8e213ebe37ae306581bb7030f62b66fff18625b (diff)
downloademacs-77e344e50a6ce7f211a7d820f87e2ab58093709d.tar.gz
emacs-77e344e50a6ce7f211a7d820f87e2ab58093709d.zip
* commands.h (immediate_quit): Remove duplicate decl.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/commands.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 392825757ae..dedf10b8e2d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-10-10 Paul Eggert <eggert@cs.ucla.edu>
2
3 * commands.h (immediate_quit): Remove duplicate decl.
4
12012-10-09 Jan Djärv <jan.h.d@swipnet.se> 52012-10-09 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * nsfont.m (Vfonts_in_cache): Remove, not needed as font.c handles 7 * nsfont.m (Vfonts_in_cache): Remove, not needed as font.c handles
diff --git a/src/commands.h b/src/commands.h
index 36f600cee01..510fce0e182 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -36,9 +36,6 @@ extern Lisp_Object control_x_map;
36 events until a non-ASCII event is acceptable as input. */ 36 events until a non-ASCII event is acceptable as input. */
37extern Lisp_Object unread_switch_frame; 37extern Lisp_Object unread_switch_frame;
38 38
39/* Nonzero means ^G can quit instantly */
40extern int immediate_quit;
41
42/* Nonzero if input is coming from the keyboard */ 39/* Nonzero if input is coming from the keyboard */
43 40
44#define INTERACTIVE (NILP (Vexecuting_kbd_macro) && !noninteractive) 41#define INTERACTIVE (NILP (Vexecuting_kbd_macro) && !noninteractive)