diff options
| author | Paul Eggert | 2011-03-13 22:49:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-13 22:49:51 -0700 |
| commit | a053e86cc52840a18124d78a63c720769e111ba3 (patch) | |
| tree | 427d85c636f1df44231b77c4c944ec322e085cb3 /src | |
| parent | 4752793e2266f5a6b25732fc38c502687f07a7eb (diff) | |
| download | emacs-a053e86cc52840a18124d78a63c720769e111ba3.tar.gz emacs-a053e86cc52840a18124d78a63c720769e111ba3.zip | |
* keyboard.h (make_ctrl_char): New decl.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/keyboard.h | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 39af059f197..749f1baf590 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-03-14 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-03-14 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * keyboard.h (make_ctrl_char): New decl. | ||
| 4 | |||
| 3 | * lisp.h (force_auto_save_soon): New decl. | 5 | * lisp.h (force_auto_save_soon): New decl. |
| 4 | 6 | ||
| 5 | * emacs.c (init_cmdargs): Rename local to avoid shadowing. | 7 | * emacs.c (init_cmdargs): Rename local to avoid shadowing. |
diff --git a/src/keyboard.h b/src/keyboard.h index 10bf16d5c5c..9f8f1ff7476 100644 --- a/src/keyboard.h +++ b/src/keyboard.h | |||
| @@ -90,7 +90,7 @@ struct kboard | |||
| 90 | 90 | ||
| 91 | /* User-supplied table to translate input characters through. */ | 91 | /* User-supplied table to translate input characters through. */ |
| 92 | Lisp_Object KBOARD_INTERNAL_FIELD (Vkeyboard_translate_table); | 92 | Lisp_Object KBOARD_INTERNAL_FIELD (Vkeyboard_translate_table); |
| 93 | 93 | ||
| 94 | /* Last command that may be repeated by `repeat'. */ | 94 | /* Last command that may be repeated by `repeat'. */ |
| 95 | Lisp_Object KBOARD_INTERNAL_FIELD (Vlast_repeatable_command); | 95 | Lisp_Object KBOARD_INTERNAL_FIELD (Vlast_repeatable_command); |
| 96 | 96 | ||
| @@ -140,12 +140,12 @@ struct kboard | |||
| 140 | /* Keymap mapping keys to alternative preferred forms. | 140 | /* Keymap mapping keys to alternative preferred forms. |
| 141 | See the DEFVAR for more documentation. */ | 141 | See the DEFVAR for more documentation. */ |
| 142 | Lisp_Object KBOARD_INTERNAL_FIELD (Vlocal_function_key_map); | 142 | Lisp_Object KBOARD_INTERNAL_FIELD (Vlocal_function_key_map); |
| 143 | 143 | ||
| 144 | /* Keymap mapping ASCII function key sequences onto their preferred | 144 | /* Keymap mapping ASCII function key sequences onto their preferred |
| 145 | forms. Initialized by the terminal-specific lisp files. See the | 145 | forms. Initialized by the terminal-specific lisp files. See the |
| 146 | DEFVAR for more documentation. */ | 146 | DEFVAR for more documentation. */ |
| 147 | Lisp_Object KBOARD_INTERNAL_FIELD (Vinput_decode_map); | 147 | Lisp_Object KBOARD_INTERNAL_FIELD (Vinput_decode_map); |
| 148 | 148 | ||
| 149 | /* Minibufferless frames on this display use this frame's minibuffer. */ | 149 | /* Minibufferless frames on this display use this frame's minibuffer. */ |
| 150 | Lisp_Object KBOARD_INTERNAL_FIELD (Vdefault_minibuffer_frame); | 150 | Lisp_Object KBOARD_INTERNAL_FIELD (Vdefault_minibuffer_frame); |
| 151 | 151 | ||
| @@ -494,6 +494,7 @@ extern int input_polling_used (void); | |||
| 494 | extern void clear_input_pending (void); | 494 | extern void clear_input_pending (void); |
| 495 | extern int requeued_events_pending_p (void); | 495 | extern int requeued_events_pending_p (void); |
| 496 | extern void bind_polling_period (int); | 496 | extern void bind_polling_period (int); |
| 497 | extern int make_ctrl_char (int); | ||
| 497 | extern void stuff_buffered_input (Lisp_Object); | 498 | extern void stuff_buffered_input (Lisp_Object); |
| 498 | extern void clear_waiting_for_input (void); | 499 | extern void clear_waiting_for_input (void); |
| 499 | extern void swallow_events (int); | 500 | extern void swallow_events (int); |
| @@ -517,4 +518,3 @@ extern void add_user_signal (int, const char *); | |||
| 517 | extern int tty_read_avail_input (struct terminal *, int, | 518 | extern int tty_read_avail_input (struct terminal *, int, |
| 518 | struct input_event *); | 519 | struct input_event *); |
| 519 | extern EMACS_TIME timer_check (int); | 520 | extern EMACS_TIME timer_check (int); |
| 520 | |||