Mercurial > emacs
diff src/w32fns.c @ 87301:1d6e3255f024
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-956
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 16 Dec 2007 04:31:49 +0000 |
| parents | d57729b69f59 fb6105cb466b |
| children | cdd30283527d 2fcaae6177a5 |
line wrap: on
line diff
--- a/src/w32fns.c Sun Dec 16 04:31:33 2007 +0000 +++ b/src/w32fns.c Sun Dec 16 04:31:49 2007 +0000 @@ -2957,7 +2957,7 @@ they don't produce WM_CHAR messages). This ensures that indicator lights are toggled promptly on Windows 9x, for example. */ - if (lispy_function_keys[wParam] != 0) + if (wParam < 256 && lispy_function_keys[wParam]) { windows_translate = 1; goto translate; @@ -3079,7 +3079,7 @@ break; default: /* If not defined as a function key, change it to a WM_CHAR message. */ - if (lispy_function_keys[wParam] == 0) + if (wParam > 255 || !lispy_function_keys[wParam]) { DWORD modifiers = construct_console_modifiers (); @@ -8159,7 +8159,7 @@ int i; for (i = 0; i < 256; i++) - if (lispy_function_keys[i] != 0 + if (lispy_function_keys[i] && strcmp (lispy_function_keys[i], key) == 0) return i; @@ -8337,7 +8337,7 @@ vk_code = HOTKEY_VK_CODE (hotkeyid); w32_modifiers = HOTKEY_MODIFIERS (hotkeyid); - if (lispy_function_keys[vk_code]) + if (vk_code < 256 && lispy_function_keys[vk_code]) key = intern (lispy_function_keys[vk_code]); else key = make_number (vk_code);