diff options
| author | Jan D | 2010-09-27 22:43:03 +0200 |
|---|---|---|
| committer | Jan D | 2010-09-27 22:43:03 +0200 |
| commit | d8a4b27a847945fb629067132d7287cc075083dd (patch) | |
| tree | f8441287b07957bf112bf5dd8e1789680eb6f1e1 /src | |
| parent | 993687257900ca2c1cab6437e799c67de67341f5 (diff) | |
| download | emacs-d8a4b27a847945fb629067132d7287cc075083dd.tar.gz emacs-d8a4b27a847945fb629067132d7287cc075083dd.zip | |
* process.c (wait_reading_process_output): Add missing FD_CLR
for write_mask (must mirror connect_wait_mask).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/process.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 18f71f31dde..fac06961ef9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-09-27 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * process.c (wait_reading_process_output): Add missing FD_CLR | ||
| 4 | for write_mask (must mirror connect_wait_mask). | ||
| 5 | |||
| 1 | 2010-09-27 Teodor Zlatanov <tzz@lifelogs.com> | 6 | 2010-09-27 Teodor Zlatanov <tzz@lifelogs.com> |
| 2 | 7 | ||
| 3 | * gnutls.c (gnutls_log_function): Show level and "gnutls.c" | 8 | * gnutls.c (gnutls_log_function): Show level and "gnutls.c" |
diff --git a/src/process.c b/src/process.c index cf16027b30a..4536dcc2a8e 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -5068,6 +5068,7 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd, | |||
| 5068 | struct Lisp_Process *p; | 5068 | struct Lisp_Process *p; |
| 5069 | 5069 | ||
| 5070 | FD_CLR (channel, &connect_wait_mask); | 5070 | FD_CLR (channel, &connect_wait_mask); |
| 5071 | FD_CLR (channel, &write_mask); | ||
| 5071 | if (--num_pending_connects < 0) | 5072 | if (--num_pending_connects < 0) |
| 5072 | abort (); | 5073 | abort (); |
| 5073 | 5074 | ||