Mercurial > emacs

diff src/nsterm.m @ 102418:b14d67d22033

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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
line wrap: on
line diff
--- 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);