emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] master af3db69: Fix NS main thread check (bug#25265)


From: Alan Third
Subject: [Emacs-diffs] master af3db69: Fix NS main thread check (bug#25265)
Date: Sat, 14 Jan 2017 17:14:43 +0000 (UTC)

branch: master
commit af3db69ee640d9a1e9027c04ba3b5bec7c2681ab
Author: Alan Third <address@hidden>
Commit: Alan Third <address@hidden>

    Fix NS main thread check (bug#25265)
    
    * src/nsterm.m (ns_read_socket, ns_select): Replace mainThread with
    isMainThread.
---
 src/nsterm.m |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nsterm.m b/src/nsterm.m
index 90664f6..63f1b15 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4039,7 +4039,7 @@ ns_read_socket (struct terminal *terminal, struct 
input_event *hold_quit)
       return i;
     }
 
-  if ([NSThread mainThread])
+  if ([NSThread isMainThread])
     {
       block_input ();
       n_emacs_events_pending = 0;
@@ -4123,7 +4123,7 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds,
     }
 
   if (NSApp == nil
-      || ![NSThread mainThread]
+      || ![NSThread isMainThread]
       || (timeout && timeout->tv_sec == 0 && timeout->tv_nsec == 0))
     return pselect (nfds, readfds, writefds, exceptfds, timeout, sigmask);
 



reply via email to

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