From: Lars Magne Ingebrigtsen Date: Sat, 16 Jul 2011 18:27:08 +0000 (+0200) Subject: Use the same condition for POLL_FOR_INPUT in both keyboard.c and process.c X-Git-Tag: emacs-pretest-24.0.90~104^2~228 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dd88932771fc7b16428b185fe93f7f696b489c7e;p=emacs.git Use the same condition for POLL_FOR_INPUT in both keyboard.c and process.c Fixes: debbugs:1858 --- 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 + + * process.c: Use the same condition for POLL_FOR_INPUT in both + keyboard.c and process.c (bug#1858). + 2011-07-09 Lawrence Mitchell * 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