procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nsterm.m (keydown): avoid infinite loop

Browse source
This commit is contained in:
David Reitter 2009-06-26 18:37:41 +00:00
parent 6ada5ad143
commit 25c5550f48
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2009-06-26 David Reitter <david.reitter@gmail.com>
* nsterm.m (keydown): avoid infinite loop
2009-06-26 Peter Jolly <peter@jollys.org> (tiny change)
* ftfont.c (get_adstyle_property): Call font_intern_prop with 1 as

4
src/nsterm.m
View file

@ -4468,7 +4468,9 @@ - (void)keyDown: (NSEvent *)theEvent
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