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

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Adrian Robert <arobert> 09/06/30 12:19:01

Modified files:
        src            : ChangeLog nsterm.m 

Log message:
        * nsterm.m (keydown): Avoid infinite loop.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.7586.2.7&r2=1.7586.2.8
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.m?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.75&r2=1.75.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7586.2.7
retrieving revision 1.7586.2.8
diff -u -b -r1.7586.2.7 -r1.7586.2.8
--- ChangeLog   28 Jun 2009 20:14:26 -0000      1.7586.2.7
+++ ChangeLog   30 Jun 2009 12:18:58 -0000      1.7586.2.8
@@ -1,3 +1,7 @@
+2009-06-28  David Reitter <address@hidden>
+
+       * nsterm.m (keydown): Avoid infinite loop.
+
 2009-06-28  Andreas Schwab  <address@hidden>
 
        * process.c (send_process): Keep decoded string in a local

Index: nsterm.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.m,v
retrieving revision 1.75
retrieving revision 1.75.2.1
diff -u -b -r1.75 -r1.75.2.1
--- nsterm.m    8 Jun 2009 04:32:42 -0000       1.75
+++ nsterm.m    30 Jun 2009 12:19:01 -0000      1.75.2.1
@@ -4469,6 +4469,8 @@
 
  if (![[self window] isKeyWindow]
      && [[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