aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/keyboard.c6
-rw-r--r--src/process.c6
3 files changed, 5 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8cbd4c54e33..2a149a07214 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-06-05 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * keyboard.c, process.c: Do not define POLL_FOR_INPUT here
4 because it will be defined in generated config.h if needed.
5
12014-06-04 Dmitry Antipov <dmantipov@yandex.ru> 62014-06-04 Dmitry Antipov <dmantipov@yandex.ru>
2 7
3 Use terminal-specific hooks to display popup dialogs. 8 Use terminal-specific hooks to display popup dialogs.
diff --git a/src/keyboard.c b/src/keyboard.c
index 17bfc81b82f..80b1f521310 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -377,12 +377,6 @@ bool interrupt_input;
377/* Nonzero while interrupts are temporarily deferred during redisplay. */ 377/* Nonzero while interrupts are temporarily deferred during redisplay. */
378bool interrupts_deferred; 378bool interrupts_deferred;
379 379
380/* If we support a window system, turn on the code to poll periodically
381 to detect C-g. It isn't actually used when doing interrupt input. */
382#ifdef HAVE_WINDOW_SYSTEM
383#define POLL_FOR_INPUT
384#endif
385
386/* The time when Emacs started being idle. */ 380/* The time when Emacs started being idle. */
387 381
388static struct timespec timer_idleness_start_time; 382static struct timespec timer_idleness_start_time;
diff --git a/src/process.c b/src/process.c
index 9321cdc4875..7f9b5ac59d1 100644
--- a/src/process.c
+++ b/src/process.c
@@ -286,12 +286,6 @@ static int read_process_output (Lisp_Object, int);
286static void handle_child_signal (int); 286static void handle_child_signal (int);
287static void create_pty (Lisp_Object); 287static void create_pty (Lisp_Object);
288 288
289/* If we support a window system, turn on the code to poll periodically
290 to detect C-g. It isn't actually used when doing interrupt input. */
291#ifdef HAVE_WINDOW_SYSTEM
292#define POLL_FOR_INPUT
293#endif
294
295static Lisp_Object get_process (register Lisp_Object name); 289static Lisp_Object get_process (register Lisp_Object name);
296static void exec_sentinel (Lisp_Object proc, Lisp_Object reason); 290static void exec_sentinel (Lisp_Object proc, Lisp_Object reason);
297 291