From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#20892: 25.0.50; Applying vc-diff hunks on CRLF tracked files Date: Wed, 24 Jun 2015 17:57:57 +0300 Message-ID: <83y4j9duh6.fsf@gnu.org> References: Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8BIT X-Trace: ger.gmane.org 1435157963 28594 80.91.229.3 (24 Jun 2015 14:59:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 24 Jun 2015 14:59:23 +0000 (UTC) Cc: 20892@debbugs.gnu.org To: joaotavora@gmail.com (=?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?=) Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jun 24 16:59:11 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 1Z7m8s-0001Kl-E2 for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Jun 2015 16:59:10 +0200 Original-Received: from localhost ([::1]:51148 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7m8r-0001CG-QC for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Jun 2015 10:59:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7m8o-0001CA-H1 for bug-gnu-emacs@gnu.org; Wed, 24 Jun 2015 10:59:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7m8l-0000FG-6p for bug-gnu-emacs@gnu.org; Wed, 24 Jun 2015 10:59:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:55120) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7m8l-0000F3-2e for bug-gnu-emacs@gnu.org; Wed, 24 Jun 2015 10:59:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Z7m8k-0001z8-H8 for bug-gnu-emacs@gnu.org; Wed, 24 Jun 2015 10:59:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 24 Jun 2015 14:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20892 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20892-submit@debbugs.gnu.org id=B20892.14351578977572 (code B ref 20892); Wed, 24 Jun 2015 14:59:02 +0000 Original-Received: (at 20892) by debbugs.gnu.org; 24 Jun 2015 14:58:17 +0000 Original-Received: from localhost ([127.0.0.1]:56566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z7m80-0001y2-Sk for submit@debbugs.gnu.org; Wed, 24 Jun 2015 10:58:17 -0400 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:55719) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Z7m7x-0001xn-I2 for 20892@debbugs.gnu.org; Wed, 24 Jun 2015 10:58:14 -0400 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NQG00100E90ZA00@mtaout24.012.net.il> for 20892@debbugs.gnu.org; Wed, 24 Jun 2015 17:49:33 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NQG00LL3EILRL60@mtaout24.012.net.il>; Wed, 24 Jun 2015 17:49:33 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il 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:104302 Archived-At: > From: joaotavora@gmail.com (João Távora) > Date: Wed, 24 Jun 2015 12:29:05 +0100 > > @@ -1799,7 +1799,8 @@ > (with-current-buffer buf > (goto-char (car pos)) > (delete-region (car pos) (cdr pos)) > - (insert (car new))) > + (insert (decode-coding-string (car new) > + buffer-file-coding-system))) That doesn't sound right: the string you are passing to decode-coding-string is already a multibyte string in Emacs's internal representation. So decoding it one more time is not what you want. I think we should simply remove the CR characters from the end of each line, if buffer-file-coding-system states DOS EOL format. (You can check the latter with coding-system-eol-type.) Thanks.