diff options
| author | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
| commit | 2c302df3a13236bfbf8ea1b771d13618fcda8d71 (patch) | |
| tree | f26dc9f22861dc37610de319d05255de058c221b /src/keyboard.h | |
| parent | 0c747cb143fa227e78f350ac353d703f489209df (diff) | |
| parent | 175069efeb080517afefdd44a06f7a779ea8c25c (diff) | |
| download | emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.tar.gz emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.zip | |
Merge from trunk
Diffstat (limited to 'src/keyboard.h')
| -rw-r--r-- | src/keyboard.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/keyboard.h b/src/keyboard.h index 9fd3b48eba9..7f36691a5a3 100644 --- a/src/keyboard.h +++ b/src/keyboard.h | |||
| @@ -490,6 +490,8 @@ extern unsigned long last_event_timestamp; | |||
| 490 | 490 | ||
| 491 | extern int quit_char; | 491 | extern int quit_char; |
| 492 | 492 | ||
| 493 | extern int timers_run; | ||
| 494 | |||
| 493 | extern int parse_menu_item (Lisp_Object, int); | 495 | extern int parse_menu_item (Lisp_Object, int); |
| 494 | 496 | ||
| 495 | extern void echo_now (void); | 497 | extern void echo_now (void); |
| @@ -534,5 +536,3 @@ extern int tty_read_avail_input (struct terminal *, int, | |||
| 534 | struct input_event *); | 536 | struct input_event *); |
| 535 | extern EMACS_TIME timer_check (int); | 537 | extern EMACS_TIME timer_check (int); |
| 536 | 538 | ||
| 537 | /* arch-tag: 769cbade-1ba9-4950-b886-db265b061aa3 | ||
| 538 | (do not change this comment) */ | ||