From 25c5550f48ae371dbbe4e7cd7048efcefa030670 Mon Sep 17 00:00:00 2001 From: David Reitter Date: Fri, 26 Jun 2009 18:37:41 +0000 Subject: [PATCH] nsterm.m (keydown): avoid infinite loop --- src/ChangeLog | 4 ++++ src/nsterm.m | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + * nsterm.m (keydown): avoid infinite loop + 2009-06-26 Peter Jolly (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 -- 2.39.2