Mercurial > emacs
changeset 101351:1789feb8fd54
* nsterm.m (EmavsView-keyDown:): Treat nil as Qnone for ns_alternate_modifier. (Bug#1217)
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Thu, 22 Jan 2009 11:39:10 +0000 |
| parents | b8bf70ca95b2 |
| children | 913b00d24272 |
| files | src/ChangeLog src/nsterm.m |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Jan 22 07:00:08 2009 +0000 +++ b/src/ChangeLog Thu Jan 22 11:39:10 2009 +0000 @@ -1,3 +1,8 @@ +2009-01-21 Adrian Robert <Adrian.B.Robert@gmail.com> + + * nsterm.m (EmavsView-keyDown:): Treat nil as Qnone for + ns_alternate_modifier. (Bug#1217) + 2009-01-22 Chong Yidong <cyd@stupidchicken.com> * fileio.c (Vwrite_region_post_annotation_function)
--- a/src/nsterm.m Thu Jan 22 07:00:08 2009 +0000 +++ b/src/nsterm.m Thu Jan 22 11:39:10 2009 +0000 @@ -4213,11 +4213,17 @@ /* TODO: these may help w/IO switching btwn terminal and NSApp */ +- (void)applicationWillBecomeActive: (NSNotification *)notification +{ + //ns_app_active=YES; +} - (void)applicationDidBecomeActive: (NSNotification *)notification { + //ns_app_active=YES; } - (void)applicationDidResignActive: (NSNotification *)notification { + //ns_app_active=NO; ns_send_appdefined (-1); } @@ -4505,7 +4511,8 @@ if (flags & NSAlternateKeyMask) /* default = meta */ { - if (EQ (ns_alternate_modifier, Qnone) && !fnKeysym) + if ((NILP (ns_alternate_modifier) || EQ (ns_alternate_modifier, Qnone)) + && !fnKeysym) { /* accept pre-interp alt comb */ if ([[theEvent characters] length] > 0) code = [[theEvent characters] characterAtIndex: 0];