Mercurial > emacs
comparison src/nsterm.m @ 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 | 87d779fe8006 |
children | 03f8a267cd56 |
comparison
equal
deleted
inserted
replaced
102417:5a5d05398f9e | 102418:b14d67d22033 |
---|---|
3219 int result; | 3219 int result; |
3220 double time; | 3220 double time; |
3221 NSEvent *ev; | 3221 NSEvent *ev; |
3222 /* NSTRACE (ns_select); */ | 3222 /* NSTRACE (ns_select); */ |
3223 | 3223 |
3224 if (NSApp == nil /* || ([NSApp isActive] == NO && | 3224 if (NSApp == nil || inNsSelect == 1 /* || ([NSApp isActive] == NO && |
3225 [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil | 3225 [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil |
3226 inMode:NSDefaultRunLoopMode dequeue:NO] == nil) */) | 3226 inMode:NSDefaultRunLoopMode dequeue:NO] == nil) */) |
3227 return select (nfds, readfds, writefds, exceptfds, timeout); | 3227 return select (nfds, readfds, writefds, exceptfds, timeout); |
3228 | 3228 |
3229 /* Save file descriptor set, which gets overwritten in calls to select () | 3229 /* Save file descriptor set, which gets overwritten in calls to select () |