diff options
| author | K. Handa | 2016-01-14 21:55:43 +0900 |
|---|---|---|
| committer | K. Handa | 2016-01-14 21:55:43 +0900 |
| commit | 641a3472ef245157ebcb2114f2d608cb3cb401a7 (patch) | |
| tree | 85e524c8d12caca29588382205f536b2008edc55 /src/keyboard.h | |
| parent | 9835757013569673854b692ccbb58bfb3c3ed1f7 (diff) | |
| parent | ee83b77f5ddede0fed518d0c23cf0ae38ce5b745 (diff) | |
| download | emacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.tar.gz emacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/keyboard.h')
| -rw-r--r-- | src/keyboard.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/keyboard.h b/src/keyboard.h index 890d24eb2d9..55667bfb17c 100644 --- a/src/keyboard.h +++ b/src/keyboard.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Declarations useful when processing input. | 1 | /* Declarations useful when processing input. |
| 2 | Copyright (C) 1985-1987, 1993, 2001-2015 Free Software Foundation, | 2 | Copyright (C) 1985-1987, 1993, 2001-2016 Free Software Foundation, |
| 3 | Inc. | 3 | Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| @@ -415,6 +415,8 @@ 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 | extern void (*handle_user_signal_hook) (int); | ||
| 419 | |||
| 418 | /* True while doing kbd input. */ | 420 | /* True while doing kbd input. */ |
| 419 | extern bool waiting_for_input; | 421 | extern bool waiting_for_input; |
| 420 | 422 | ||