diff options
| author | Jason Rumney | 2010-08-14 15:35:24 +0800 |
|---|---|---|
| committer | Jason Rumney | 2010-08-14 15:35:24 +0800 |
| commit | e66f9a1b7aa18b9b59dde84bab8f90dbc0fbed49 (patch) | |
| tree | 1906cc2bdfa67f8ba3b59921396f98160eec3de1 | |
| parent | 810717b6cc799a3364e0c47af9694e5eabd25c76 (diff) | |
| download | emacs-e66f9a1b7aa18b9b59dde84bab8f90dbc0fbed49.tar.gz emacs-e66f9a1b7aa18b9b59dde84bab8f90dbc0fbed49.zip | |
(lispy_function_keys): Do not define VK_PACKET (bug#4836)
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/keyboard.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 648e303d543..6c9bb832f2b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-08-14 Jason Rumney <jasonr@gnu.org> | ||
| 2 | |||
| 3 | * keyboard.c (lispy_function_keys): Do not define VK_PACKET (bug#4836) | ||
| 4 | |||
| 1 | 2010-08-14 Chong Yidong <cyd@stupidchicken.com> | 5 | 2010-08-14 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * fns.c (Fmake_hash_table): Doc fix (Bug#6851). | 7 | * fns.c (Fmake_hash_table): Doc fix (Bug#6851). |
diff --git a/src/keyboard.c b/src/keyboard.c index 1ec3fbe7460..c92d359f66a 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -4941,9 +4941,9 @@ char const *lispy_function_keys[] = | |||
| 4941 | 0, /* VK_OEM_102 0xE2 */ | 4941 | 0, /* VK_OEM_102 0xE2 */ |
| 4942 | "ico-help", /* VK_ICO_HELP 0xE3 */ | 4942 | "ico-help", /* VK_ICO_HELP 0xE3 */ |
| 4943 | "ico-00", /* VK_ICO_00 0xE4 */ | 4943 | "ico-00", /* VK_ICO_00 0xE4 */ |
| 4944 | 0, /* VK_PROCESSKEY 0xE5 */ | 4944 | 0, /* VK_PROCESSKEY 0xE5 - used by IME */ |
| 4945 | "ico-clear", /* VK_ICO_CLEAR 0xE6 */ | 4945 | "ico-clear", /* VK_ICO_CLEAR 0xE6 */ |
| 4946 | "packet", /* VK_PACKET 0xE7 */ | 4946 | 0, /* VK_PACKET 0xE7 - used to pass unicode chars */ |
| 4947 | 0, /* 0xE8 */ | 4947 | 0, /* 0xE8 */ |
| 4948 | "reset", /* VK_OEM_RESET 0xE9 */ | 4948 | "reset", /* VK_OEM_RESET 0xE9 */ |
| 4949 | "jump", /* VK_OEM_JUMP 0xEA */ | 4949 | "jump", /* VK_OEM_JUMP 0xEA */ |