diff options
| author | YAMAMOTO Mitsuharu | 2006-05-20 07:15:33 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2006-05-20 07:15:33 +0000 |
| commit | 431225c60ec5d1a204c3e7cd29942d3db4cb28a8 (patch) | |
| tree | 28bdb122e8327c65d2c5ff478d3829bb5ef423f0 /src | |
| parent | 0cd80dfa3f00fdba0ef49edbaf2d512819e464c8 (diff) | |
| download | emacs-431225c60ec5d1a204c3e7cd29942d3db4cb28a8.tar.gz emacs-431225c60ec5d1a204c3e7cd29942d3db4cb28a8.zip | |
(convert_fn_keycode): Fix last change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/macterm.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b2f6e402c0d..4636c945877 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2006-05-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | ||
| 2 | |||
| 3 | * macterm.c (convert_fn_keycode): Fix last change. | ||
| 4 | |||
| 1 | 2006-05-19 Eli Zaretskii <eliz@gnu.org> | 5 | 2006-05-19 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * w32.c (init_environment): Perform the processing of environment | 7 | * w32.c (init_environment): Perform the processing of environment |
diff --git a/src/macterm.c b/src/macterm.c index 7b20e8b9427..5401e9dfe0e 100644 --- a/src/macterm.c +++ b/src/macterm.c | |||
| @@ -9692,7 +9692,7 @@ convert_fn_keycode (EventRef eventRef, int keyCode, int *newCode) | |||
| 9692 | { | 9692 | { |
| 9693 | err = GetEventParameter (eventRef, kEventParamKeyModifiers, typeUInt32, | 9693 | err = GetEventParameter (eventRef, kEventParamKeyModifiers, typeUInt32, |
| 9694 | NULL, sizeof (UInt32), NULL, &mods); | 9694 | NULL, sizeof (UInt32), NULL, &mods); |
| 9695 | if (err != noErr && mods & kEventKeyModifierFnMask) | 9695 | if (err == noErr && mods & kEventKeyModifierFnMask) |
| 9696 | { *newCode = fn_keycode_to_xkeysym_table [keyCode & 0x7f]; | 9696 | { *newCode = fn_keycode_to_xkeysym_table [keyCode & 0x7f]; |
| 9697 | 9697 | ||
| 9698 | return (*newCode != 0); | 9698 | return (*newCode != 0); |