aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2012-10-14 20:28:48 +0200
committerJan Djärv2012-10-14 20:28:48 +0200
commita36fb15e087568aa9aa304bf2bf53d09b6b1894c (patch)
tree0577c78ae149d6f9f301c5dd1657a62286252085
parent7b9abf24ee3fa39a2f0dc2cf186737216cffc6ad (diff)
downloademacs-a36fb15e087568aa9aa304bf2bf53d09b6b1894c.tar.gz
emacs-a36fb15e087568aa9aa304bf2bf53d09b6b1894c.zip
* nsterm.m (ns_select): Count fd:s in writefs also.
Fixes: debbugs:12422
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsterm.m5
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 346fe0e86b3..0b3d02f75ac 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-10-14 Jan Djärv <jan.h.d@swipnet.se>
2
3 * nsterm.m (ns_select): Count fd:s in writefs also (Bug#12422).
4
12012-10-13 Jan Djärv <jan.h.d@swipnet.se> 52012-10-13 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * gtkutil.c (xg_set_widget_bg): Divide by 65535 (Bug#12612). 7 * gtkutil.c (xg_set_widget_bg): Divide by 65535 (Bug#12612).
diff --git a/src/nsterm.m b/src/nsterm.m
index 98dd0a8aab1..dfc84db50f7 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3444,7 +3444,10 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds,
3444/* NSTRACE (ns_select); */ 3444/* NSTRACE (ns_select); */
3445 3445
3446 for (k = 0; readfds && k < nfds+1; k++) 3446 for (k = 0; readfds && k < nfds+1; k++)
3447 if (FD_ISSET(k, readfds)) ++nr; 3447 {
3448 if (FD_ISSET(k, readfds)) ++nr;
3449 if (FD_ISSET(k, writefds)) ++nr;
3450 }
3448 3451
3449 if (NSApp == nil 3452 if (NSApp == nil
3450 || (timeout && timeout->tv_sec == 0 && timeout->tv_nsec == 0)) 3453 || (timeout && timeout->tv_sec == 0 && timeout->tv_nsec == 0))