summaryrefslogtreecommitdiff
path: root/src/nsterm.m
diff options
context:
space:
mode:
authorAlan Third <alan@idiocy.org>2017-03-13 15:02:37 +0000
committerAlan Third <alan@idiocy.org>2017-03-14 14:45:41 +0000
commit9bfa797395104d39bfe73e9c1d07b67b5838e0dd (patch)
tree3d8c4b34e87b60ab303c56590c870121fe569dbb /src/nsterm.m
parentea5a7f990dc56ab92b04d668fcf72bb330bf2d78 (diff)
downloademacs-9bfa797395104d39bfe73e9c1d07b67b5838e0dd.tar.gz
emacs-9bfa797395104d39bfe73e9c1d07b67b5838e0dd.tar.bz2
emacs-9bfa797395104d39bfe73e9c1d07b67b5838e0dd.zip
Revert "Add missing timeout value in ns_select"
This reverts commit a65236214d9202fb69a6ba5169d4ac1a4bcb0b0d.
Diffstat (limited to 'src/nsterm.m')
-rw-r--r--src/nsterm.m8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/nsterm.m b/src/nsterm.m
index 05435697cf3..4748cd3e137 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];
}