Merge from trunk.

1 files changed, 19 insertions, 4 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index bad91ea3f72..79d9e7a18e8 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7200,6 +7200,7 @@ handle_async_input (void)
 #endif
 }
 
+#ifdef SYNC_INPUT
 void
 process_pending_signals (void)
 {
@@ -7207,6 +7208,7 @@ process_pending_signals (void)
     handle_async_input ();
   do_pending_atimers ();
 }
+#endif
 
 #ifdef SIGIO   /* for entire page */
 /* Note SIGIO has been undef'd if FIONREAD is missing.  */
@@ -10218,7 +10220,7 @@ DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,
 
   memset (keybuf, 0, sizeof keybuf);
   GCPRO1 (keybuf[0]);
-  gcpro1.nvars = (sizeof keybuf/sizeof (keybuf[0]));
+  gcpro1.nvars = (sizeof keybuf / sizeof (keybuf[0]));
 
   if (NILP (continue_echo))
     {
@@ -10232,7 +10234,7 @@ DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,
     cancel_hourglass ();
 #endif
 
-  i = read_key_sequence (keybuf, (sizeof keybuf/sizeof (keybuf[0])),
+  i = read_key_sequence (keybuf, (sizeof keybuf / sizeof (keybuf[0])),
                          prompt, ! NILP (dont_downcase_last),
                          ! NILP (can_return_switch_frame), 0);
 
@@ -10923,6 +10925,11 @@ interrupt_signal (int signalnum)	/* If we don't have an argument, some */
   errno = old_errno;
 }
 
+/* If Emacs is stuck because `inhibit-quit' is true, then keep track
+   of the number of times C-g has been requested.  If C-g is pressed
+   enough times, then quit anyway.  See bug#6585.  */
+static int force_quit_count;
+
 /* This routine is called at interrupt level in response to C-g.
 
    It is called from the SIGINT handler or kbd_buffer_store_event.
@@ -11041,8 +11048,16 @@ handle_interrupt (void)
           UNGCPRO;
         }
       else
-        /* Else request quit when it's safe */
-        Vquit_flag = Qt;
+        { /* Else request quit when it's safe.  */
+          if (NILP (Vquit_flag))
+            force_quit_count = 0;
+          if (++force_quit_count == 3)
+            {
+              immediate_quit = 1;
+              Vinhibit_quit = Qnil;
+            }
+          Vquit_flag = Qt;
+        }
     }
 
 /* TODO: The longjmp in this call throws the NS event loop integration off,