* configure.ac (POLL_FOR_INPUT): Define with HAVE_WINDOW_SYSTEM.

* nt/inc/ms-w32.h (POLL_FOR_INPUT): Likewise.
* src/keyboard.c, src/process.c: Do not define POLL_FOR_INPUT here
because it will be defined in generated config.h if needed.
This commit is contained in:
Dmitry Antipov 2014-06-05 10:24:54 +04:00
parent 0d46b5f12c
commit ea633fff4c
7 changed files with 15 additions and 12 deletions

View file

@ -1,3 +1,7 @@
2014-06-05 Dmitry Antipov <dmantipov@yandex.ru>
* configure.ac (POLL_FOR_INPUT): Define with HAVE_WINDOW_SYSTEM.
2014-06-05 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac: --without-all now implies --without-xft, --disable-acl.

View file

@ -4847,6 +4847,7 @@ AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
## Common for all window systems
if test "$window_system" != "none"; then
AC_DEFINE(HAVE_WINDOW_SYSTEM, 1, [Define if you have a window system.])
AC_DEFINE(POLL_FOR_INPUT, 1, [Define if you poll periodically to detect C-g.])
WINDOW_SYSTEM_OBJ="fontset.o fringe.o image.o"
fi

View file

@ -1,3 +1,7 @@
2014-06-05 Dmitry Antipov <dmantipov@yandex.ru>
* inc/ms-w32.h (POLL_FOR_INPUT): Define with HAVE_WINDOW_SYSTEM.
2014-05-29 Eli Zaretskii <eliz@gnu.org>
* Makefile.in (DONT_INSTALL): Now empty.

View file

@ -159,6 +159,7 @@ extern char *getenv ();
#ifdef HAVE_NTGUI
# ifndef HAVE_WINDOW_SYSTEM
# define HAVE_WINDOW_SYSTEM 1
# define POLL_FOR_INPUT 1
# endif
#endif

View file

@ -1,3 +1,8 @@
2014-06-05 Dmitry Antipov <dmantipov@yandex.ru>
* keyboard.c, process.c: Do not define POLL_FOR_INPUT here
because it will be defined in generated config.h if needed.
2014-06-04 Dmitry Antipov <dmantipov@yandex.ru>
Use terminal-specific hooks to display popup dialogs.

View file

@ -377,12 +377,6 @@ bool interrupt_input;
/* Nonzero while interrupts are temporarily deferred during redisplay. */
bool interrupts_deferred;
/* 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
#define POLL_FOR_INPUT
#endif
/* The time when Emacs started being idle. */
static struct timespec timer_idleness_start_time;

View file

@ -286,12 +286,6 @@ static int read_process_output (Lisp_Object, int);
static void handle_child_signal (int);
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
#define POLL_FOR_INPUT
#endif
static Lisp_Object get_process (register Lisp_Object name);
static void exec_sentinel (Lisp_Object proc, Lisp_Object reason);