[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 9bfa797 2/3: Revert "Add missing timeout value in n
From: |
Alan Third |
Subject: |
[Emacs-diffs] master 9bfa797 2/3: Revert "Add missing timeout value in ns_select" |
Date: |
Tue, 14 Mar 2017 10:47:59 -0400 (EDT) |
branch: master
commit 9bfa797395104d39bfe73e9c1d07b67b5838e0dd
Author: Alan Third <address@hidden>
Commit: Alan Third <address@hidden>
Revert "Add missing timeout value in ns_select"
This reverts commit a65236214d9202fb69a6ba5169d4ac1a4bcb0b0d.
---
src/nsterm.m | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/nsterm.m b/src/nsterm.m
index 0543569..4748cd3 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4168,16 +4168,10 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds,
/* Inform fd_handler that select should be called */
c = 'g';
emacs_write_sig (selfds[1], &c, 1);
-
- /* We rely on fd_handler timing out to cause
- nextEventMatchingMask below to return, so set it's timeout to
- an unreasonably long time. */
- timeout_date = [NSDate distantFuture];
}
else if (nr == 0 && timeout)
{
- /* No file descriptor, just a timeout, no need to wake
- fd_handler. Set nextEventMatchingMask timeout. */
+ /* No file descriptor, just a timeout, no need to wake fd_handler */
double time = timespectod (*timeout);
timeout_date = [NSDate dateWithTimeIntervalSinceNow: time];
}