diff options
| author | Paul Eggert | 2011-07-16 17:37:57 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-16 17:37:57 -0700 |
| commit | 4f8a4547454e24304b4182fbf4ae4b34a7bdc92b (patch) | |
| tree | d03d6d6cdd4b10a62633ed5f9da42d60dac016d0 /src/process.c | |
| parent | f0eb61e99dce9005dc94c909046f6130b3d4a97c (diff) | |
| parent | 64a465b2d97d00f27ed74513047ced07b798b9fd (diff) | |
| download | emacs-4f8a4547454e24304b4182fbf4ae4b34a7bdc92b.tar.gz emacs-4f8a4547454e24304b4182fbf4ae4b34a7bdc92b.zip | |
Merge from trunk.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); | |||
| 245 | 245 | ||
| 246 | /* If we support a window system, turn on the code to poll periodically | 246 | /* If we support a window system, turn on the code to poll periodically |
| 247 | to detect C-g. It isn't actually used when doing interrupt input. */ | 247 | to detect C-g. It isn't actually used when doing interrupt input. */ |
| 248 | #ifdef HAVE_WINDOW_SYSTEM | 248 | #if defined(HAVE_WINDOW_SYSTEM) && !defined(USE_ASYNC_EVENTS) |
| 249 | #define POLL_FOR_INPUT | 249 | #define POLL_FOR_INPUT |
| 250 | #endif | 250 | #endif |
| 251 | 251 | ||