[Emacs-diffs] emacs/src ChangeLog nsterm.m

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/01/22 11:39:12

Modified files:
        src            : ChangeLog nsterm.m 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7297&r2=1.7298
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.m?cvsroot=emacs&r1=1.47&r2=1.48

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7297
retrieving revision 1.7298
diff -u -b -r1.7297 -r1.7298
--- ChangeLog   22 Jan 2009 04:42:41 -0000      1.7297
+++ ChangeLog   22 Jan 2009 11:39:10 -0000      1.7298
@@ -1,3 +1,8 @@
+2009-01-21  Adrian Robert  <address@hidden>
+
+       * nsterm.m (EmavsView-keyDown:): Treat nil as Qnone for
+       ns_alternate_modifier. (Bug#1217)
+
 2009-01-22  Chong Yidong  <address@hidden>
 
        * fileio.c (Vwrite_region_post_annotation_function)

Index: nsterm.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.m,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- nsterm.m    21 Jan 2009 22:28:47 -0000      1.47
+++ nsterm.m    22 Jan 2009 11:39:12 -0000      1.48
@@ -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];