(command_loop_1): Bind inhibit-quit to t when in Fsit_for.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 8988a5e762c..17d81655c23 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -799,7 +799,13 @@ command_loop_1 ()
 
       if (minibuf_level && echo_area_glyphs)
         {
+          /* Bind inhibit-quit to t so that C-g gets read in
+             rather than quitting back to the minibuffer.  */
+          int count = specpdl_ptr - specpdl;
+          specbind (Qinhibit_quit, Qt);
           Fsit_for (make_number (2), Qnil, Qnil);
+          unbind_to (count);
+
           echo_area_glyphs = 0;
           no_direct = 1;
           if (!NILP (Vquit_flag))