aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2004-01-21 05:24:01 +0000
committerStefan Monnier2004-01-21 05:24:01 +0000
commit35d3b513d31907715da05d815b9ca0a13a206423 (patch)
treea4b06fb5e174911e34611c5d69c9eae43bf94602 /src
parentb65c1b44897ddae92eca834f60f11008aee94247 (diff)
downloademacs-35d3b513d31907715da05d815b9ca0a13a206423.tar.gz
emacs-35d3b513d31907715da05d815b9ca0a13a206423.zip
(QUIT) [SYNC_INPUT]: Check interrupt_input_pending as well.
Diffstat (limited to 'src')
-rw-r--r--src/lisp.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/lisp.h b/src/lisp.h
index 72d24d79f05..b54668fb780 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1726,6 +1726,9 @@ extern char *stack_bottom;
1726 This is a good thing to do around a loop that has no side effects 1726 This is a good thing to do around a loop that has no side effects
1727 and (in particular) cannot call arbitrary Lisp code. */ 1727 and (in particular) cannot call arbitrary Lisp code. */
1728 1728
1729#ifdef SYNC_INPUT
1730extern void handle_async_input P_ ((void));
1731extern int interrupt_input_pending;
1729#define QUIT \ 1732#define QUIT \
1730 do { \ 1733 do { \
1731 if (!NILP (Vquit_flag) && NILP (Vinhibit_quit)) \ 1734 if (!NILP (Vquit_flag) && NILP (Vinhibit_quit)) \
@@ -1733,8 +1736,24 @@ extern char *stack_bottom;
1733 Vquit_flag = Qnil; \ 1736 Vquit_flag = Qnil; \
1734 Fsignal (Qquit, Qnil); \ 1737 Fsignal (Qquit, Qnil); \
1735 } \ 1738 } \
1739 else if (interrupt_input_pending) \
1740 handle_async_input (); \
1736 } while (0) 1741 } while (0)
1737 1742
1743#else /* not SYNC_INPUT */
1744
1745#define QUIT \
1746 do { \
1747 if (!NILP (Vquit_flag) && NILP (Vinhibit_quit)) \
1748 { \
1749 Vquit_flag = Qnil; \
1750 Fsignal (Qquit, Qnil); \
1751 } \
1752 } while (0)
1753
1754#endif /* not SYNC_INPUT */
1755
1756
1738/* Nonzero if ought to quit now. */ 1757/* Nonzero if ought to quit now. */
1739 1758
1740#define QUITP (!NILP (Vquit_flag) && NILP (Vinhibit_quit)) 1759#define QUITP (!NILP (Vquit_flag) && NILP (Vinhibit_quit))