From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ian Kelling Newsgroups: gmane.emacs.bugs Subject: bug#20976: 25.0.50; [PATCH] Fix too high return in some cases of status_notify Date: Sat, 04 Jul 2015 02:13:32 -0700 Message-ID: <87vbe0s2tf.fsf@iankelling.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1436001274 29141 80.91.229.3 (4 Jul 2015 09:14:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Jul 2015 09:14:34 +0000 (UTC) To: 20976@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jul 04 11:14:15 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZBJWT-0005mR-8P for geb-bug-gnu-emacs@m.gmane.org; Sat, 04 Jul 2015 11:14:09 +0200 Original-Received: from localhost ([::1]:43681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBJWS-00030n-Fj for geb-bug-gnu-emacs@m.gmane.org; Sat, 04 Jul 2015 05:14:08 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBJWP-00030i-Gk for bug-gnu-emacs@gnu.org; Sat, 04 Jul 2015 05:14:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZBJWM-0005by-As for bug-gnu-emacs@gnu.org; Sat, 04 Jul 2015 05:14:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:37780) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBJWM-0005bu-7P for bug-gnu-emacs@gnu.org; Sat, 04 Jul 2015 05:14:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1ZBJWM-0003CO-1e for bug-gnu-emacs@gnu.org; Sat, 04 Jul 2015 05:14:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Ian Kelling Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 04 Jul 2015 09:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 20976 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.143600123312271 (code B ref -1); Sat, 04 Jul 2015 09:14:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 4 Jul 2015 09:13:53 +0000 Original-Received: from localhost ([127.0.0.1]:39226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZBJWC-0003Br-NM for submit@debbugs.gnu.org; Sat, 04 Jul 2015 05:13:53 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:40913) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZBJWB-0003Bc-1W for submit@debbugs.gnu.org; Sat, 04 Jul 2015 05:13:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZBJW5-0005Wk-3f for submit@debbugs.gnu.org; Sat, 04 Jul 2015 05:13:45 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:39364) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBJW5-0005We-0Q for submit@debbugs.gnu.org; Sat, 04 Jul 2015 05:13:45 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBJW4-0002zU-3p for bug-gnu-emacs@gnu.org; Sat, 04 Jul 2015 05:13:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZBJW0-0005VZ-3g for bug-gnu-emacs@gnu.org; Sat, 04 Jul 2015 05:13:44 -0400 Original-Received: from out5-smtp.messagingengine.com ([66.111.4.29]:56068) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBJVz-0005Uu-TJ for bug-gnu-emacs@gnu.org; Sat, 04 Jul 2015 05:13:40 -0400 Original-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 38C8E20B29; Sat, 4 Jul 2015 05:13:38 -0400 (EDT) Original-Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 04 Jul 2015 05:13:38 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=iankelling.org; h= content-type:date:from:message-id:mime-version:subject:to :x-sasl-enc:x-sasl-enc; s=mesmtp; bh=CyotL8dfWYqm7uPSpkQCRjtMVxs =; b=hFt1gYIhiRDYzytACsPf07Zf924EojvBc3xiaLA0TOGAG9aZc9cK0qu/R5J IBwP3j2upo1a5gCZHtO0g1sLnjXte1ZI7TFrkunLoKxzLg6sukl/lvBDKjmFr0E1 O+7KdoUVpKE/fbpg1cWi/HpO4WYXFInWI91moRg+sfYCbYrk= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=Cy otL8dfWYqm7uPSpkQCRjtMVxs=; b=fB/J+CQPCgwgs4YOAvW1ymE9XlT2HWcP8r tkq2m+HyK5SUd1pBJx0dgfpm7KcumSjiNmL/QHFoX4LKDdKoDEx5AToabp12nL4F YDlMe+MeVAihxh0EvXCrOdoAwBYNfJecSM8lhsDzBfvrEp20WEs7eXgWUAqycovL A2nliwT88= X-Sasl-enc: u+P/rXu+wFJKaJ4U1DwSEU6wiqhj7tnLWqmzj4mGkbhC 1436001217 Original-Received: from treetowl.lan (c-73-53-70-213.hsd1.wa.comcast.net [73.53.70.213]) by mail.messagingengine.com (Postfix) with ESMTPA id E1F5668012A for ; Sat, 4 Jul 2015 05:13:37 -0400 (EDT) Original-Received: by treetowl.lan (Postfix, from userid 1000) id 1B1801FE26; Sat, 4 Jul 2015 02:13:32 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:104674 Archived-At: * src/process.c (status_notify): Fix too high return in some cases. --- This was clearly intended to be part of the patch for debbugs:17647 (git 05d2821). The same pattern used elsewhere and wait_proc is an an unused parameter added in that patch. diff --git a/src/process.c b/src/process.c index 3132f19..5272792 100644 --- a/src/process.c +++ b/src/process.c @@ -6714,7 +6714,8 @@ status_notify (struct Lisp_Process *deleting_process, && p != deleting_process) { int nread = read_process_output (proc, p->infd); - if (got_some_input < nread) + if ((!wait_proc || wait_proc == XPROCESS (proc)) + && got_some_input < nread) got_some_input = nread; if (nread <= 0) break; -- 1.9.1