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: Sat, 02 Apr 2016 17:27:20 +0300 Message-ID: <837fggrsqf.fsf@gnu.org> References: <83y4j9duh6.fsf@gnu.org> <83bng3etpy.fsf@gnu.org> <83wpohrrsm.fsf@gnu.org> <83oa9ss6f7.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1459607363 5584 80.91.229.3 (2 Apr 2016 14:29:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 2 Apr 2016 14:29:23 +0000 (UTC) Cc: 20892-done@debbugs.gnu.org, monnier@iro.umontreal.ca To: =?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 Sat Apr 02 16:29:12 2016 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 1amMY2-0004zr-Hg for geb-bug-gnu-emacs@m.gmane.org; Sat, 02 Apr 2016 16:29:10 +0200 Original-Received: from localhost ([::1]:49765 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amMY1-0008JJ-J6 for geb-bug-gnu-emacs@m.gmane.org; Sat, 02 Apr 2016 10:29:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amMXy-0008Hy-31 for bug-gnu-emacs@gnu.org; Sat, 02 Apr 2016 10:29:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amMXu-0002wb-2j for bug-gnu-emacs@gnu.org; Sat, 02 Apr 2016 10:29:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:51863) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amMXt-0002wQ-W4 for bug-gnu-emacs@gnu.org; Sat, 02 Apr 2016 10:29:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1amMXt-0000FF-SK for bug-gnu-emacs@gnu.org; Sat, 02 Apr 2016 10:29:01 -0400 Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Sat, 02 Apr 2016 14:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 20892 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 20892@debbugs.gnu.org, eliz@gnu.org, joaotavora@gmail.com Original-Received: via spool by 20892-done@debbugs.gnu.org id=D20892.1459607283851 (code D ref 20892); Sat, 02 Apr 2016 14:29:01 +0000 Original-Received: (at 20892-done) by debbugs.gnu.org; 2 Apr 2016 14:28:03 +0000 Original-Received: from localhost ([127.0.0.1]:48989 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1amMWw-0000Df-UB for submit@debbugs.gnu.org; Sat, 02 Apr 2016 10:28:03 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:41608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1amMWv-0000DB-8t for 20892-done@debbugs.gnu.org; Sat, 02 Apr 2016 10:28:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amMWm-0002l6-2R for 20892-done@debbugs.gnu.org; Sat, 02 Apr 2016 10:27:55 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:39616) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amMWl-0002kq-V1; Sat, 02 Apr 2016 10:27:51 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:1070 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1amMWk-0002dy-R0; Sat, 02 Apr 2016 10:27:51 -0400 In-reply-to: (message from =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= on Sat, 2 Apr 2016 14:42:48 +0100) 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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:115871 Archived-At: > From: João Távora > Date: Sat, 2 Apr 2016 14:42:48 +0100 > Cc: Stefan Monnier , 20892@debbugs.gnu.org > > 1. Sometime in June 2015, upgrade my emacs. vc-diff some CRLF file > > 2. "Cool, a new feature now makes it show precisely which chars were > added and deleted even the CRs" > > 3. "Oh, but vc-apply-hunk stopped working, let's open bug 20892" > > 4. Discuss bug, argue that showing ^M is cool for when you really want > to apply patches that add and remove just one or two of those. > > 5. Apply some reasonable fix to my config. Be side-tracked by > dayjob. Lose interest in discussing the bug, > > 6. Eventually, realize 4 is silly and if you're mixing CRLF and > non-CRLF line endings you've already lost. > > 7. Recently, March 2016, also realize that diacritics are also wrong > in latin-1 files. > > 8. Decide to reevaluate situation, read some code and commit messages, > and propose a new fix that makes the vc-diff buffer have the same > encoding as the originating file, as apparently was intended. > vc-apply-hunk is fixed, if I ever need to do something like 4 > I'll do it outside of emacs. > > I think you can close the bug. Thanks, closing.