aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2011-12-05 01:15:15 +0100
committerJuanma Barranquero2011-12-05 01:15:15 +0100
commit7dbda6dfe8058e6abcaf2436277b9beae7605e20 (patch)
treec2d8e3a1ed86ee92f997741793403c0fe9ce896e /src
parent5158face2e2830946ecb24badb27e764ee62906c (diff)
downloademacs-7dbda6dfe8058e6abcaf2436277b9beae7605e20.tar.gz
emacs-7dbda6dfe8058e6abcaf2436277b9beae7605e20.zip
src/lisp.h (process_quit_flag): Fix external declaration.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/lisp.h2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 98f0d46b4c5..6a08405a382 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-12-05 Juanma Barranquero <lekktu@gmail.com>
2
3 * lisp.h (process_quit_flag): Fix external declaration.
4
12011-12-04 Stefan Monnier <monnier@iro.umontreal.ca> 52011-12-04 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 Don't macro-inline non-performance-critical code. 7 Don't macro-inline non-performance-critical code.
@@ -79,7 +83,7 @@
79 83
80 * xterm.c (handle_one_xevent): Only set async_visible and friends 84 * xterm.c (handle_one_xevent): Only set async_visible and friends
81 if net_wm_state_hidden_seen is non-zero (Bug#10002) 85 if net_wm_state_hidden_seen is non-zero (Bug#10002)
82 (get_current_wm_state): Set net_wm_state_hidden_seen to 1 if 86 (get_current_wm_state): Set net_wm_state_hidden_seen to 1 if
83 _NET_WM_STATE_HIDDEN is in NET_WM_STATE. 87 _NET_WM_STATE_HIDDEN is in NET_WM_STATE.
84 88
852011-11-28 Paul Eggert <eggert@cs.ucla.edu> 892011-11-28 Paul Eggert <eggert@cs.ucla.edu>
diff --git a/src/lisp.h b/src/lisp.h
index f43533e0b6e..a80d39765e0 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2143,7 +2143,7 @@ extern int pending_signals;
2143#define ELSE_PENDING_SIGNALS 2143#define ELSE_PENDING_SIGNALS
2144#endif /* not SYNC_INPUT */ 2144#endif /* not SYNC_INPUT */
2145 2145
2146extern void handle_quit_flag (void); 2146extern void process_quit_flag (void);
2147#define QUIT \ 2147#define QUIT \
2148 do { \ 2148 do { \
2149 if (!NILP (Vquit_flag) && NILP (Vinhibit_quit)) \ 2149 if (!NILP (Vquit_flag) && NILP (Vinhibit_quit)) \