aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorDmitry Antipov2014-07-28 18:50:55 +0400
committerDmitry Antipov2014-07-28 18:50:55 +0400
commit2daa203c3eb983433b86b841bf31d3e91bb51ab4 (patch)
tree3e5c62bcf52d6ffea9254e6ce4f8a1393038d479 /src/process.c
parentda41ffdd089b529c3d5216412d95840e065c3fe3 (diff)
downloademacs-2daa203c3eb983433b86b841bf31d3e91bb51ab4.tar.gz
emacs-2daa203c3eb983433b86b841bf31d3e91bb51ab4.zip
Fix Gnus-related issues reported by David Kastrup <dak@gnu.org> in
<http://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00370.html>. * atimer.c (timerfd_callback): Always read expiration data. Add comment. (turn_on_atimers) [HAVE_TIMERFD]: Disarm timerfd timer. * process.c (add_timer_wait_descriptor): Add timer descriptor to input_wait_mask and non_process_wait_mask as well.
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/process.c b/src/process.c
index cfc1e189cab..f34be69864a 100644
--- a/src/process.c
+++ b/src/process.c
@@ -6835,7 +6835,9 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
6835void 6835void
6836add_timer_wait_descriptor (int fd) 6836add_timer_wait_descriptor (int fd)
6837{ 6837{
6838 FD_SET (fd, &input_wait_mask);
6838 FD_SET (fd, &non_keyboard_wait_mask); 6839 FD_SET (fd, &non_keyboard_wait_mask);
6840 FD_SET (fd, &non_process_wait_mask);
6839 fd_callback_info[fd].func = timerfd_callback; 6841 fd_callback_info[fd].func = timerfd_callback;
6840 fd_callback_info[fd].data = NULL; 6842 fd_callback_info[fd].data = NULL;
6841 fd_callback_info[fd].condition |= FOR_READ; 6843 fd_callback_info[fd].condition |= FOR_READ;