Commit 62901354 authored by Anders Lindgren's avatar Anders Lindgren Committed by Jan Djärv
Browse files

* nsterm.m (keyDown:): Check for normal key even if NSNumericPadKeyMask

is set.

Fixes: debbugs:16505
parent fa8ac13c
2014-02-16 Anders Lindgern <andlind@gmail.com>
* nsterm.m (keyDown:): Check for normal key even if NSNumericPadKeyMask
is set (Bug#16505).
2014-02-16 Daniel Colascione <dancol@dancol.org>
* dbusbind.c (xd_lisp_dbus_to_dbus): New function.
......
......@@ -5119,9 +5119,17 @@ most recently updated (I guess), which is not the correct one. */
/* (Carbon way: [theEvent keyCode]) */
/* is it a "function key"? */
fnKeysym = (code < 0x00ff && (flags&NSNumericPadKeyMask))
? ns_convert_key ([theEvent keyCode] | NSNumericPadKeyMask)
: ns_convert_key (code);
/* Note: Sometimes a plain key will have the NSNumericPadKeyMask
flag set (this is probably a bug in the OS).
*/
if (code < 0x00ff && (flags&NSNumericPadKeyMask))
{
fnKeysym = ns_convert_key ([theEvent keyCode] | NSNumericPadKeyMask);
}
if (fnKeysym == 0)
{
fnKeysym = ns_convert_key (code);
}
if (fnKeysym)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment