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

diff --git a/src/ChangeLog b/src/ChangeLog
index 7c80550bc4937e4cbe4dab67952850bfc2cb770b..180b7937770f98dbf6912764f28c191441e1f01a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-28  David Reitter <david.reitter@gmail.com>
+
+       * nsterm.m (keydown): Avoid infinite loop.
+
 2009-06-28  Andreas Schwab  <schwab@linux-m68k.org>
 
        * process.c (send_process): Keep decoded string in a local

diff --git a/src/nsterm.m b/src/nsterm.m
index 0089dc3a415129ccefbcf79b52e6fe0700f16f72..a56bcf15e9d875254d9910fe8af42d3b4801b14e 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4469,6 +4469,8 @@ extern void update_window_cursor (struct window *w, int on);
 
  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