emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs/src ChangeLog nsterm.m


From: Adrian Robert
Subject: [Emacs-diffs] emacs/src ChangeLog nsterm.m
Date: Thu, 05 Mar 2009 16:35:02 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/03/05 16:35:01

Modified files:
        src            : ChangeLog nsterm.m 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7400&r2=1.7401
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.m?cvsroot=emacs&r1=1.61&r2=1.62

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7400
retrieving revision 1.7401
diff -u -b -r1.7400 -r1.7401
--- ChangeLog   5 Mar 2009 12:27:04 -0000       1.7400
+++ ChangeLog   5 Mar 2009 16:34:59 -0000       1.7401
@@ -1,3 +1,7 @@
+2009-03-05  Adrian Robert  <address@hidden>
+
+       * nsterm.m (ns_select): Shortcircuit if reentrant call.
+
 2009-03-05  Kenichi Handa  <address@hidden>
 
        * font.c (font_select_entity): New function.

Index: nsterm.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.m,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- nsterm.m    26 Feb 2009 03:54:40 -0000      1.61
+++ nsterm.m    5 Mar 2009 16:35:01 -0000       1.62
@@ -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);




reply via email to

[Prev in Thread] Current Thread [Next in Thread]