2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c1511e9c243..bf0dcfdfd18 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-26  David Reitter <david.reitter@gmail.com>
+
+        * nsterm.m (keydown): avoid infinite loop
+
 2009-06-26  Peter Jolly  <peter@jollys.org>  (tiny change)
 
         * ftfont.c (get_adstyle_property): Call font_intern_prop with 1 as
diff --git a/src/nsterm.m b/src/nsterm.m
index 0089dc3a415..75567de0e57 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4468,7 +4468,9 @@ extern void update_window_cursor (struct window *w, int on);
     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