diff options
| author | Eli Zaretskii | 2015-01-31 10:35:26 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2015-01-31 10:35:26 +0200 |
| commit | eaea02c71ae15d86bb83518796775b6c3c77b71e (patch) | |
| tree | be5e723d66ca7d4d61f98b32711a68f9c3037aa1 /src | |
| parent | 376ba20ac1f516361fc9c2b0267fbc5c131e4822 (diff) | |
| download | emacs-eaea02c71ae15d86bb83518796775b6c3c77b71e.tar.gz emacs-eaea02c71ae15d86bb83518796775b6c3c77b71e.zip | |
Fix while-no-input loops (Bug#19547)
src/keyboard.c (kbd_buffer_store_event_hold): Ignore FOCUS_OUT_EVENT
and ICONIFY_EVENT for the purposes of breaking while-no-input
loops.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/keyboard.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fd211304ac5..61d1067750a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2015-01-31 Eli Zaretskii <eliz@gnu.org> | 1 | 2015-01-31 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * keyboard.c (kbd_buffer_store_event_hold): Ignore FOCUS_OUT_EVENT | ||
| 4 | and ICONIFY_EVENT for the purposes of breaking while-no-input | ||
| 5 | loops. (Bug#19547) | ||
| 6 | |||
| 3 | * dired.c (read_dirent): Correct the "MSDOS hacks" hack: the | 7 | * dired.c (read_dirent): Correct the "MSDOS hacks" hack: the |
| 4 | special code for errno = ENOENT or EACCES is needed for WINDOWSNT, | 8 | special code for errno = ENOENT or EACCES is needed for WINDOWSNT, |
| 5 | not for MSDOS. | 9 | not for MSDOS. |
diff --git a/src/keyboard.c b/src/keyboard.c index 383c109c446..7718f8efa7b 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -3639,7 +3639,9 @@ kbd_buffer_store_event_hold (register struct input_event *event, | |||
| 3639 | as input, set quit-flag to cause an interrupt. */ | 3639 | as input, set quit-flag to cause an interrupt. */ |
| 3640 | if (!NILP (Vthrow_on_input) | 3640 | if (!NILP (Vthrow_on_input) |
| 3641 | && event->kind != FOCUS_IN_EVENT | 3641 | && event->kind != FOCUS_IN_EVENT |
| 3642 | && event->kind != FOCUS_OUT_EVENT | ||
| 3642 | && event->kind != HELP_EVENT | 3643 | && event->kind != HELP_EVENT |
| 3644 | && event->kind != ICONIFY_EVENT | ||
| 3643 | && event->kind != DEICONIFY_EVENT) | 3645 | && event->kind != DEICONIFY_EVENT) |
| 3644 | { | 3646 | { |
| 3645 | Vquit_flag = Vthrow_on_input; | 3647 | Vquit_flag = Vthrow_on_input; |