From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Tue, 30 Jun 2009 12:18:58 +0000 (+0000)
Subject: * nsterm.m (keydown): Avoid infinite loop.
X-Git-Tag: emacs-pretest-23.0.96~60
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=87e8933d4c53b7327b712a9ea34878b4d15c9909;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 7c80550bc49..180b7937770 100644
--- 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 0089dc3a415..a56bcf15e9d 100644
--- 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