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

src/ChangeLog

+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)

src/nsterm.m

@@ -4213,11 +4213,17 @@ - (NSMenu *)applicationDockMenu: (NSApplication *) sender
 
 
 /* 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 @@ NSView most recently updated (I guess), which is not the correct one.
 
       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];