diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-07-16 20:27:08 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-07-16 20:27:08 +0200 |
| commit | dd88932771fc7b16428b185fe93f7f696b489c7e (patch) | |
| tree | 89ca5aa336102c9d2e7b4b5e65d896625eeddc43 | |
| parent | 011b0ad6b50df387f266e86cf818810a16e9f01f (diff) | |
| download | emacs-dd88932771fc7b16428b185fe93f7f696b489c7e.tar.gz | |
Use the same condition for POLL_FOR_INPUT in both keyboard.c and process.c
Fixes: debbugs:1858
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/process.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 56c7a148416..3c50cbb1d03 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-07-16 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * process.c: Use the same condition for POLL_FOR_INPUT in both + keyboard.c and process.c (bug#1858). + 2011-07-09 Lawrence Mitchell <wence@gmx.li> * gnutls.c (Qgnutls_bootprop_min_prime_bits): New variable. diff --git a/src/process.c b/src/process.c index 1a884357b86..236c27e5c3a 100644 --- a/src/process.c +++ b/src/process.c @@ -245,7 +245,7 @@ static void create_pty (Lisp_Object); /* If we support a window system, turn on the code to poll periodically to detect C-g. It isn't actually used when doing interrupt input. */ -#ifdef HAVE_WINDOW_SYSTEM +#if defined(HAVE_WINDOW_SYSTEM) && !defined(USE_ASYNC_EVENTS) #define POLL_FOR_INPUT #endif |