aboutsummaryrefslogtreecommitdiffstats
path: root/src/keyboard.c
diff options
context:
space:
mode:
authorJoakim Verona2011-11-22 15:46:22 +0100
committerJoakim Verona2011-11-22 15:46:22 +0100
commita9c1e05adddf6011c61c0df582c5f2ed423f35c8 (patch)
tree489fac119296416ba2f3530fd3bcb70efbbbdaa6 /src/keyboard.c
parent40bb789236e486a3f36eefb2840c293369ce2af3 (diff)
parentb5afc20930c91159a1cbf629bcaa7e251653dc74 (diff)
downloademacs-a9c1e05adddf6011c61c0df582c5f2ed423f35c8.tar.gz
emacs-a9c1e05adddf6011c61c0df582c5f2ed423f35c8.zip
upstream
Diffstat (limited to 'src/keyboard.c')
-rw-r--r--src/keyboard.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 8b94ee6b5d1..bee91c6b5cf 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4823,7 +4823,7 @@ const char *const lispy_function_keys[] =
4823 "ico-00", /* VK_ICO_00 0xE4 */ 4823 "ico-00", /* VK_ICO_00 0xE4 */
4824 0, /* VK_PROCESSKEY 0xE5 - used by IME */ 4824 0, /* VK_PROCESSKEY 0xE5 - used by IME */
4825 "ico-clear", /* VK_ICO_CLEAR 0xE6 */ 4825 "ico-clear", /* VK_ICO_CLEAR 0xE6 */
4826 0, /* VK_PACKET 0xE7 - used to pass unicode chars */ 4826 0, /* VK_PACKET 0xE7 - used to pass Unicode chars */
4827 0, /* 0xE8 */ 4827 0, /* 0xE8 */
4828 "reset", /* VK_OEM_RESET 0xE9 */ 4828 "reset", /* VK_OEM_RESET 0xE9 */
4829 "jump", /* VK_OEM_JUMP 0xEA */ 4829 "jump", /* VK_OEM_JUMP 0xEA */
@@ -10153,7 +10153,7 @@ will read just one key sequence. */)
10153 ! NILP (can_return_switch_frame), 0); 10153 ! NILP (can_return_switch_frame), 0);
10154 10154
10155#if 0 /* The following is fine for code reading a key sequence and 10155#if 0 /* The following is fine for code reading a key sequence and
10156 then proceeding with a lenghty computation, but it's not good 10156 then proceeding with a lengthy computation, but it's not good
10157 for code reading keys in a loop, like an input method. */ 10157 for code reading keys in a loop, like an input method. */
10158#ifdef HAVE_WINDOW_SYSTEM 10158#ifdef HAVE_WINDOW_SYSTEM
10159 if (display_hourglass_p) 10159 if (display_hourglass_p)
@@ -12120,7 +12120,7 @@ This variable is keyboard-local. */);
12120Function key definitions that apply to all terminal devices should go 12120Function key definitions that apply to all terminal devices should go
12121here. If a mapping is defined in both the current 12121here. If a mapping is defined in both the current
12122`local-function-key-map' binding and this variable, then the local 12122`local-function-key-map' binding and this variable, then the local
12123definition will take precendence. */); 12123definition will take precedence. */);
12124 Vfunction_key_map = Fmake_sparse_keymap (Qnil); 12124 Vfunction_key_map = Fmake_sparse_keymap (Qnil);
12125 12125
12126 DEFVAR_LISP ("key-translation-map", Vkey_translation_map, 12126 DEFVAR_LISP ("key-translation-map", Vkey_translation_map,