diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-07-08 10:13:32 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-07-08 10:13:32 -0700 |
| commit | ef0cc37f8552b30fd48cd4437f8307182533d3db (patch) | |
| tree | 06ae1ace23c959010c002c2d393c9ad68dc4b88e | |
| parent | 5e799349fde90ef1ad9c73261ecdac0a11ef57ff (diff) | |
| download | emacs-ef0cc37f8552b30fd48cd4437f8307182533d3db.tar.gz | |
* process.c (read_and_dispose_of_process_output): Fix typo
in previous patch: we want nonnegative fds, not nonzero fds.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/process.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7a29f8d803b..4c4ca3a5e00 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-07-08 Paul Eggert <eggert@cs.ucla.edu> + + * process.c (read_and_dispose_of_process_output): Fix typo + in previous patch: we want nonnegative fds, not nonzero fds. + 2014-07-08 Dmitry Antipov <dmantipov@yandex.ru> * chartab.c (char_table_translate): Move to... diff --git a/src/process.c b/src/process.c index d1b14533c99..4449493a2b6 100644 --- a/src/process.c +++ b/src/process.c @@ -5134,7 +5134,7 @@ read_and_dispose_of_process_output (struct Lisp_Process *p, char *chars, proc_encode_coding_system[p->outfd] surely points to a valid memory because p->outfd will be changed once EOF is sent to the process. */ - if (NILP (p->encode_coding_system) && p->outfd + if (NILP (p->encode_coding_system) && p->outfd >= 0 && proc_encode_coding_system[p->outfd]) { pset_encode_coding_system |