diff options
Diffstat (limited to 'src/w32fns.c')
| -rw-r--r-- | src/w32fns.c | 15 |
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) | |||
| 778 | break; | 778 | break; |
| 779 | } | 779 | } |
| 780 | 780 | ||
| 781 | QUIT; | 781 | maybe_quit (); |
| 782 | } | 782 | } |
| 783 | 783 | ||
| 784 | unblock_input (); | 784 | unblock_input (); |
| @@ -3166,18 +3166,9 @@ signal_user_input (void) | |||
| 3166 | if (!NILP (Vthrow_on_input)) | 3166 | if (!NILP (Vthrow_on_input)) |
| 3167 | { | 3167 | { |
| 3168 | Vquit_flag = Vthrow_on_input; | 3168 | Vquit_flag = Vthrow_on_input; |
| 3169 | /* Doing a QUIT from this thread is a bad idea, since this | 3169 | /* Calling maybe_quit from this thread is a bad idea, since this |
| 3170 | unwinds the stack of the Lisp thread, and the Windows runtime | 3170 | unwinds the stack of the Lisp thread, and the Windows runtime |
| 3171 | rightfully barfs. Disabled. */ | 3171 | rightfully barfs. */ |
| 3172 | #if 0 | ||
| 3173 | /* If we're inside a function that wants immediate quits, | ||
| 3174 | do it now. */ | ||
| 3175 | if (immediate_quit && NILP (Vinhibit_quit)) | ||
| 3176 | { | ||
| 3177 | immediate_quit = 0; | ||
| 3178 | QUIT; | ||
| 3179 | } | ||
| 3180 | #endif | ||
| 3181 | } | 3172 | } |
| 3182 | } | 3173 | } |
| 3183 | 3174 | ||