From: Alan Third <alan@idiocy.org>
Date: Sat, 14 Jan 2017 16:57:46 +0000 (+0000)
Subject: Fix NS main thread check (bug#25265)
X-Git-Tag: emacs-26.0.90~886^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=af3db69ee640d9a1e9027c04ba3b5bec7c2681ab;p=emacs.git

Fix NS main thread check (bug#25265)

* src/nsterm.m (ns_read_socket, ns_select): Replace mainThread with
isMainThread.
---

diff --git a/src/nsterm.m b/src/nsterm.m
index 90664f652ff..63f1b15b24e 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);