* nsterm.m (EmavsView-keyDown:): Treat nil as Qnone for ns_alternate_modifier. (Bug...

diff --git a/src/ChangeLog b/src/ChangeLog
index a3832220133686195eb8cd2ace58b261998567dc..b2cba276687629e8bf191e2a4779e52cc6f59fc1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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)

diff --git a/src/nsterm.m b/src/nsterm.m
index 826efc4a22a8b0af684b413242f93d7c8cb9cdce..119839e05d13b18fe0de968e02acd44268f4d2a0 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4213,11 +4213,17 @@ fprintf (stderr, "res = %d\n", EQ (res, Qt)); /* FIXME */
 
 
 /* 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 @@ extern void update_window_cursor (struct window *w, int on);
 
       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];