aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Third2017-03-13 15:02:37 +0000
committerAlan Third2017-03-14 14:45:41 +0000
commit9bfa797395104d39bfe73e9c1d07b67b5838e0dd (patch)
tree3d8c4b34e87b60ab303c56590c870121fe569dbb
parentea5a7f990dc56ab92b04d668fcf72bb330bf2d78 (diff)
downloademacs-9bfa797395104d39bfe73e9c1d07b67b5838e0dd.tar.gz
emacs-9bfa797395104d39bfe73e9c1d07b67b5838e0dd.zip
Revert "Add missing timeout value in ns_select"
This reverts commit a65236214d9202fb69a6ba5169d4ac1a4bcb0b0d.
-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,
4168 /* Inform fd_handler that select should be called */ 4168 /* Inform fd_handler that select should be called */
4169 c = 'g'; 4169 c = 'g';
4170 emacs_write_sig (selfds[1], &c, 1); 4170 emacs_write_sig (selfds[1], &c, 1);
4171
4172 /* We rely on fd_handler timing out to cause
4173 nextEventMatchingMask below to return, so set it's timeout to
4174 an unreasonably long time. */
4175 timeout_date = [NSDate distantFuture];
4176 } 4171 }
4177 else if (nr == 0 && timeout) 4172 else if (nr == 0 && timeout)
4178 { 4173 {
4179 /* No file descriptor, just a timeout, no need to wake 4174 /* No file descriptor, just a timeout, no need to wake fd_handler */
4180 fd_handler. Set nextEventMatchingMask timeout. */
4181 double time = timespectod (*timeout); 4175 double time = timespectod (*timeout);
4182 timeout_date = [NSDate dateWithTimeIntervalSinceNow: time]; 4176 timeout_date = [NSDate dateWithTimeIntervalSinceNow: time];
4183 } 4177 }