aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorIan Kelling2015-07-05 15:14:12 -0700
committerPaul Eggert2015-07-05 15:15:01 -0700
commitcbeeab2eab5d53f0fba452d4790d7a58071605e2 (patch)
tree79a09a027c4da5ceb926addcc101030600b13791 /src/process.c
parent5516728eac58aba87a39427b7a3d1bfb8e2a19d0 (diff)
downloademacs-cbeeab2eab5d53f0fba452d4790d7a58071605e2.tar.gz
emacs-cbeeab2eab5d53f0fba452d4790d7a58071605e2.zip
accept-process-output fix
This is a followon to the fix for Bug#17647 (Bug#20976). * src/process.c (status_notify): Fix too high return in some cases.
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c
index 3132f19d636..70c9076d4e8 100644
--- a/src/process.c
+++ b/src/process.c
@@ -6714,7 +6714,8 @@ status_notify (struct Lisp_Process *deleting_process,
6714 && p != deleting_process) 6714 && p != deleting_process)
6715 { 6715 {
6716 int nread = read_process_output (proc, p->infd); 6716 int nread = read_process_output (proc, p->infd);
6717 if (got_some_input < nread) 6717 if ((!wait_proc || wait_proc == XPROCESS (proc))
6718 && got_some_input < nread)
6718 got_some_input = nread; 6719 got_some_input = nread;
6719 if (nread <= 0) 6720 if (nread <= 0)
6720 break; 6721 break;