Mercurial > emacs
changeset 102418:b14d67d22033
* nsterm.m (ns_select): Shortcircuit if reentrant call.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Thu, 05 Mar 2009 16:34:59 +0000 |
| parents | 5a5d05398f9e |
| children | 2fd3e5c68dab |
| files | src/ChangeLog src/nsterm.m |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Mar 05 12:40:18 2009 +0000 +++ b/src/ChangeLog Thu Mar 05 16:34:59 2009 +0000 @@ -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.
--- a/src/nsterm.m Thu Mar 05 12:40:18 2009 +0000 +++ b/src/nsterm.m Thu Mar 05 16:34:59 2009 +0000 @@ -3221,7 +3221,7 @@ 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);