Merge branch 'master' into nick.lloyd-bytecode-jitnick.lloyd-bytecode-jit

1 files changed, 1 insertions, 10 deletions

diff --git a/src/w32fns.c b/src/w32fns.c
index 6a576fcec27..1b628b0b42e 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3168,16 +3168,7 @@ signal_user_input (void)
       Vquit_flag = Vthrow_on_input;
       /* 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 = false;
-          maybe_quit ();
-        }
-#endif
+         rightfully barfs.  */
     }
 }