Merge branch 'master' into comment-cachecomment-cache

1 files changed, 3 insertions, 12 deletions

diff --git a/src/w32fns.c b/src/w32fns.c
index c24fce11fc8..1b628b0b42e 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -778,7 +778,7 @@ w32_color_map_lookup (const char *colorname)
           break;
         }
 
-      QUIT;
+      maybe_quit ();
     }
 
   unblock_input ();
@@ -3166,18 +3166,9 @@ signal_user_input (void)
   if (!NILP (Vthrow_on_input))
     {
       Vquit_flag = Vthrow_on_input;
-      /* Doing a QUIT from this thread is a bad idea, since this
+      /* Calling maybe_quit from this thread is a bad idea, since this
          unwinds the stack of the Lisp thread, and the Windows runtime
-         rightfully barfs.  Disabled.  */
-#if 0
-      /* If we're inside a function that wants immediate quits,
-         do it now.  */
-      if (immediate_quit && NILP (Vinhibit_quit))
-        {
-          immediate_quit = 0;
-          QUIT;
-        }
-#endif
+         rightfully barfs.  */
     }
 }