* keyboard.c [POLL_FOR_INPUT] (quit_throw_to_read_char): If

	we're polling for input, abort; input polling should always be
	suppressed while we're waiting for input.

	* keyboard.c (interrupt_signal): Remove extern declaration of
	Vwindow_system; this is no longer used.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index aa2a8503270..468d9703fe0 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4265,7 +4265,6 @@ interrupt_signal ()
   char c;
   /* Must preserve main program's value of errno.  */
   int old_errno = errno;
-  extern Lisp_Object Vwindow_system;
 
 #ifdef USG
   /* USG systems forget handlers when they are used;
@@ -4358,6 +4357,12 @@ quit_throw_to_read_char ()
   unread_command_events = Qnil;
   unread_command_char = -1;
 
+#ifdef POLL_FOR_INPUT
+  /* May be > 1 if in recursive minibuffer.  */
+  if (poll_suppress_count == 0)
+    abort ();
+#endif
+
   _longjmp (getcjmp, 1);
 }