From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#29916: 26.0.90; CRLF in diff-command output breaks smerge hunk header parsing Date: Fri, 05 Jan 2018 11:23:59 +0200 Message-ID: <83608gbqvk.fsf@gnu.org> References: <83y3lid8eg.fsf@gnu.org> <83shbnas3z.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1515144204 13624 195.159.176.226 (5 Jan 2018 09:23:24 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 5 Jan 2018 09:23:24 +0000 (UTC) Cc: monnier@iro.umontreal.ca, 29916-done@debbugs.gnu.org To: rcopley@gmail.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jan 05 10:23:19 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eXODZ-0002r3-EW for geb-bug-gnu-emacs@m.gmane.org; Fri, 05 Jan 2018 10:23:13 +0100 Original-Received: from localhost ([::1]:57654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eXOFY-0003mg-KC for geb-bug-gnu-emacs@m.gmane.org; Fri, 05 Jan 2018 04:25:16 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eXOFO-0003ew-Gj for bug-gnu-emacs@gnu.org; Fri, 05 Jan 2018 04:25:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eXOFL-0004bs-Ba for bug-gnu-emacs@gnu.org; Fri, 05 Jan 2018 04:25:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:55893) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eXOFL-0004bb-7f for bug-gnu-emacs@gnu.org; Fri, 05 Jan 2018 04:25:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eXOFL-0000vu-1s for bug-gnu-emacs@gnu.org; Fri, 05 Jan 2018 04:25:03 -0500 Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Fri, 05 Jan 2018 09:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 29916 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 29916@debbugs.gnu.org, eliz@gnu.org, rcopley@gmail.com Original-Received: via spool by 29916-done@debbugs.gnu.org id=D29916.15151442713528 (code D ref 29916); Fri, 05 Jan 2018 09:25:02 +0000 Original-Received: (at 29916-done) by debbugs.gnu.org; 5 Jan 2018 09:24:31 +0000 Original-Received: from localhost ([127.0.0.1]:36339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eXOEp-0000up-BS for submit@debbugs.gnu.org; Fri, 05 Jan 2018 04:24:31 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:41093) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eXOEn-0000ub-E6 for 29916-done@debbugs.gnu.org; Fri, 05 Jan 2018 04:24:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eXOEf-0003x7-3v for 29916-done@debbugs.gnu.org; Fri, 05 Jan 2018 04:24:24 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:43507) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eXOEf-0003wz-0f; Fri, 05 Jan 2018 04:24:21 -0500 Original-Received: from [176.228.60.248] (port=4385 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1eXOEe-0005Vw-Ba; Fri, 05 Jan 2018 04:24:20 -0500 In-reply-to: <83shbnas3z.fsf@gnu.org> (message from Eli Zaretskii on Wed, 03 Jan 2018 17:18:08 +0200) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:141791 Archived-At: > Date: Wed, 03 Jan 2018 17:18:08 +0200 > From: Eli Zaretskii > Cc: monnier@iro.umontreal.ca, 29916@debbugs.gnu.org > > > From: Richard Copley > > Date: Tue, 2 Jan 2018 21:41:03 +0000 > > Cc: Eli Zaretskii , 29916@debbugs.gnu.org > > > > Eli, will you make the change please? > > Will do. Done.