diff options
| author | Eli Zaretskii | 2016-12-11 17:59:55 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2016-12-11 17:59:55 +0200 |
| commit | 997081634a3b6c2359226305db05c818c492a9b2 (patch) | |
| tree | cc86cad29bc4a3621c0a48a6a196d87f7b5d13eb /src/keyboard.h | |
| parent | c0cfe9bc143686cd97d431831f47787753a95a42 (diff) | |
| download | emacs-997081634a3b6c2359226305db05c818c492a9b2.tar.gz emacs-997081634a3b6c2359226305db05c818c492a9b2.zip | |
Avoid aborts when a thread signals an error
* src/thread.h (struct thread_state): Add members
m_waiting_for_input and m_input_available_clear_time.
(waiting_for_input, input_available_clear_time): New macros.
* src/keyboard.c (waiting_for_input, input_available_clear_time):
Remove; they are now macros that reference the current thread.
(Bug#25171)
* src/w32select.c: Don't include keyboard.h.
* test/src/thread-tests.el (thread-errors): New test.
Diffstat (limited to 'src/keyboard.h')
| -rw-r--r-- | src/keyboard.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/keyboard.h b/src/keyboard.h index a5ed5e10a98..5084c39b7c1 100644 --- a/src/keyboard.h +++ b/src/keyboard.h | |||
| @@ -415,13 +415,6 @@ extern void unuse_menu_items (void); | |||
| 415 | #define EVENT_HEAD_KIND(event_head) \ | 415 | #define EVENT_HEAD_KIND(event_head) \ |
| 416 | (Fget ((event_head), Qevent_kind)) | 416 | (Fget ((event_head), Qevent_kind)) |
| 417 | 417 | ||
| 418 | /* True while doing kbd input. */ | ||
| 419 | extern bool waiting_for_input; | ||
| 420 | |||
| 421 | /* Address (if not 0) of struct timespec to zero out if a SIGIO interrupt | ||
| 422 | happens. */ | ||
| 423 | extern struct timespec *input_available_clear_time; | ||
| 424 | |||
| 425 | extern bool ignore_mouse_drag_p; | 418 | extern bool ignore_mouse_drag_p; |
| 426 | 419 | ||
| 427 | extern Lisp_Object parse_modifiers (Lisp_Object); | 420 | extern Lisp_Object parse_modifiers (Lisp_Object); |