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

* nsterm.m (ns_select): Shortcircuit if reentrant call.

Browse source
This commit is contained in:
Adrian Robert 2009-03-05 16:34:59 +00:00
parent 69a8e4848d
commit ccbc445286
2 changed files with 5 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-03-05 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsterm.m (ns_select): Shortcircuit if reentrant call.
2009-03-05 Kenichi Handa <handa@m17n.org>
* font.c (font_select_entity): New function.

2
src/nsterm.m
View file

@ -3221,7 +3221,7 @@ overwriting cursor (usually when cursor on a tab) */
NSEvent *ev;
/* NSTRACE (ns_select); */
if (NSApp == nil /* || ([NSApp isActive] == NO &&
if (NSApp == nil || inNsSelect == 1 /* || ([NSApp isActive] == NO &&
[NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil
inMode:NSDefaultRunLoopMode dequeue:NO] == nil) */)
return select (nfds, readfds, writefds, exceptfds, timeout);