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

[David Reitter]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     David Reitter <davidswelt>      09/06/26 18:37:43

Modified files:
        src            : nsterm.m ChangeLog 

Log message:
        nsterm.m (keydown): avoid infinite loop

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.m?cvsroot=emacs&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7603&r2=1.7604

Patches:
Index: nsterm.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.m,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- nsterm.m    8 Jun 2009 04:32:42 -0000       1.75
+++ nsterm.m    26 Jun 2009 18:37:41 -0000      1.76
@@ -4468,7 +4468,9 @@
     return;
 
  if (![[self window] isKeyWindow]
-     && [[theEvent window] isKindOfClass: [EmacsWindow class]])
+     && [[theEvent window] isKindOfClass: [EmacsWindow class]]
+     /* we must avoid an infinite loop here. */
+     && (EmacsView *)[[theEvent window] delegate] != self)
    {
      /* XXX: There is an occasional condition in which, when Emacs display
          updates a different frame from the current one, and temporarily

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7603
retrieving revision 1.7604
diff -u -b -r1.7603 -r1.7604
--- ChangeLog   26 Jun 2009 06:16:07 -0000      1.7603
+++ ChangeLog   26 Jun 2009 18:37:41 -0000      1.7604
@@ -1,3 +1,7 @@
+2009-06-26  David Reitter <address@hidden>
+
+       * nsterm.m (keydown): avoid infinite loop
+
 2009-06-26  Peter Jolly  <address@hidden>  (tiny change)
 
        * ftfont.c (get_adstyle_property): Call font_intern_prop with 1 as