diff options
| author | Juanma Barranquero | 2011-03-14 18:07:53 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2011-03-14 18:07:53 +0100 |
| commit | 7684e57b24092dbfbbe7fc62a1a544e40e2ce88a (patch) | |
| tree | fee092544c95e422483f41079d1bfd9dfdd6248f /src/keyboard.h | |
| parent | e756ec02a4415f054cac4887a1b03ae4d7ed6ccb (diff) | |
| download | emacs-7684e57b24092dbfbbe7fc62a1a544e40e2ce88a.tar.gz emacs-7684e57b24092dbfbbe7fc62a1a544e40e2ce88a.zip | |
src/w32*.c: Clean up extern declarations.
* w32select.c: Don't #include "keyboard.h".
(run_protected): Add extern declaration for waiting_for_input.
* lisp.h (VWindow_system, Qfile_name_history):
* keyboard.h (lispy_function_keys) [WINDOWSNT]:
* w32term.h (w32_system_caret_hwnd, w32_system_caret_height)
(w32_system_caret_x, w32_system_caret_y): Declare extern.
* w32.c (Qlocal, noninteractive1, inhibit_window_system):
* w32console.c (detect_input_pending, read_input_pending)
(encode_terminal_code):
* w32fns.c (quit_char, lispy_function_keys, Qtooltip)
(w32_system_caret_hwnd, w32_system_caret_height, w32_system_caret_x)
(w32_system_caret_y, Qfile_name_history):
* w32font.c (w32font_driver, QCantialias, QCotf, QClang):
* w32inevt.c (reinvoke_input_signal, lispy_function_keys):
* w32menu.c (Qmenu_bar, QCtoggle, QCradio, Qoverriding_local_map)
(Qoverriding_terminal_local_map, Qmenu_bar_update_hook):
* w32proc.c (Qlocal, report_file_error):
* w32term.c (Vwindow_system, updating_frame):
* w32uniscribe.c (initialized, uniscribe_font_driver):
Remove unneeded extern declarations.
Diffstat (limited to 'src/keyboard.h')
| -rw-r--r-- | src/keyboard.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/keyboard.h b/src/keyboard.h index 10bf16d5c5c..f2000a44643 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 | ||
| @@ -518,3 +518,6 @@ extern int tty_read_avail_input (struct terminal *, int, | |||
| 518 | struct input_event *); | 518 | struct input_event *); |
| 519 | extern EMACS_TIME timer_check (int); | 519 | extern EMACS_TIME timer_check (int); |
| 520 | 520 | ||
| 521 | #ifdef WINDOWSNT | ||
| 522 | extern const char *const lispy_function_keys[]; | ||
| 523 | #endif | ||