From 87e8933d4c53b7327b712a9ea34878b4d15c9909 Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Tue, 30 Jun 2009 12:18:58 +0000 Subject: [PATCH] * nsterm.m (keydown): Avoid infinite loop. --- src/ChangeLog | 4 ++++ src/nsterm.m | 2 ++ 2 files changed, 6 insertions(+) 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 + + * nsterm.m (keydown): Avoid infinite loop. + 2009-06-28 Andreas Schwab * 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 -- 2.39.2