From: Gerd Möllmann <gerd@gnu.org>
Date: Sat, 9 Mar 2024 14:06:29 +0000 (+0100)
Subject: Prevent freezes on macOS (bug#69561)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=deca1ff4cfd0110f91eb33de88346ee5c80b0514;p=emacs.git

Prevent freezes on macOS (bug#69561)

* src/nsterm.m (ns_select_1): Store pending input_events. Always call
[NSApp run].

(cherry picked from commit 4ac4cec652ffaca4333d8f297b8a6c0e5bd79c68)
---

diff --git a/src/nsterm.m b/src/nsterm.m
index f094b145fe3..f161edc4ac2 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4739,12 +4739,15 @@ ns_select_1 (int nfds, fd_set *readfds, fd_set *writefds,
   check_native_fs ();
 #endif
 
-  if (hold_event_q.nr > 0 && !run_loop_only)
+  /* If there are input events pending, store them so that Emacs can
+     recognize C-g.  (And we must make sure [NSApp run] is called in
+     this function, so that C-g has a chance to land in
+     hold_event_q.)  */
+  if (hold_event_q.nr > 0)
     {
-      /* We already have events pending.  */
-      raise (SIGIO);
-      errno = EINTR;
-      return -1;
+      for (int i = 0; i < hold_event_q.nr; ++i)
+        kbd_buffer_store_event_hold (&hold_event_q.q[i], NULL);
+      hold_event_q.nr = 0;
     }
 
   eassert (nfds <= FD_SETSIZE);
@@ -4757,8 +4760,8 @@ ns_select_1 (int nfds, fd_set *readfds, fd_set *writefds,
   if (NSApp == nil
       || ![NSThread isMainThread]
       || (timeout && timeout->tv_sec == 0 && timeout->tv_nsec == 0))
-    return thread_select (pselect, nfds, readfds, writefds,
-			  exceptfds, timeout, sigmask);
+    thread_select (pselect, nfds, readfds, writefds,
+		   exceptfds, timeout, sigmask);
   else
     {
       struct timespec t = {0, 0};