diff options
| author | David Reitter <david.reitter@gmail.com> | 2009-06-26 18:37:41 +0000 |
|---|---|---|
| committer | David Reitter <david.reitter@gmail.com> | 2009-06-26 18:37:41 +0000 |
| commit | efa6212639b290ad756328c7944aba438447a796 (patch) | |
| tree | 4c91530e16b23413466751ac83164ba5e1675bf1 /src/nsterm.m | |
| parent | bf7babb601bef8308c8b1b21f0b60533108b8321 (diff) | |
| download | emacs-efa6212639b290ad756328c7944aba438447a796.tar.gz | |
nsterm.m (keydown): avoid infinite loop
Diffstat (limited to 'src/nsterm.m')
| -rw-r--r-- | src/nsterm.m | 4 |
1 files changed, 3 insertions, 1 deletions
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 |