From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= Newsgroups: gmane.emacs.bugs Subject: bug#20892: 25.0.50; Applying vc-diff hunks on CRLF tracked files Date: Sat, 2 Apr 2016 14:42:48 +0100 Message-ID: References: <83y4j9duh6.fsf@gnu.org> <83bng3etpy.fsf@gnu.org> <83wpohrrsm.fsf@gnu.org> <83oa9ss6f7.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1459604659 30929 80.91.229.3 (2 Apr 2016 13:44:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 2 Apr 2016 13:44:19 +0000 (UTC) Cc: 20892@debbugs.gnu.org, Stefan Monnier To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Apr 02 15:44:11 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 1amLqT-0000uH-GT for geb-bug-gnu-emacs@m.gmane.org; Sat, 02 Apr 2016 15:44:09 +0200 Original-Received: from localhost ([::1]:49645 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amLqT-0007jY-02 for geb-bug-gnu-emacs@m.gmane.org; Sat, 02 Apr 2016 09:44:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amLqP-0007jD-ER for bug-gnu-emacs@gnu.org; Sat, 02 Apr 2016 09:44:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amLqM-0002qs-7x for bug-gnu-emacs@gnu.org; Sat, 02 Apr 2016 09:44:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:50761) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amLqM-0002qo-4O for bug-gnu-emacs@gnu.org; Sat, 02 Apr 2016 09:44:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1amLqL-0005gZ-Vb for bug-gnu-emacs@gnu.org; Sat, 02 Apr 2016 09:44:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 02 Apr 2016 13:44:01 +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.145960459521787 (code B ref 20892); Sat, 02 Apr 2016 13:44:01 +0000 Original-Received: (at 20892) by debbugs.gnu.org; 2 Apr 2016 13:43:15 +0000 Original-Received: from localhost ([127.0.0.1]:47888 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1amLpb-0005fL-Bq for submit@debbugs.gnu.org; Sat, 02 Apr 2016 09:43:15 -0400 Original-Received: from mail-ig0-f169.google.com ([209.85.213.169]:36897) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1amLpZ-0005f8-Pc for 20892@debbugs.gnu.org; Sat, 02 Apr 2016 09:43:14 -0400 Original-Received: by mail-ig0-f169.google.com with SMTP id l20so21846900igf.0 for <20892@debbugs.gnu.org>; Sat, 02 Apr 2016 06:43:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=gXPXDPT/Vx5XP2+UjnQSXgJOC877/5HHqhfoapbfckM=; b=ytROdvXg5VJyIHj8TxY2jirm8Bz2wYCGG44zTDdBvtbIVKyxkMYgSrWGVD+K+Ve/yB xB+BdFDIYXtAWG6ytv/6jrx6vOcUpWLJU0+yfqYZNg8SZUN84M9AEiPYQTniQkYN5PfF VkE7bn+tY0mlyDvjKlFONnXFRIF6ZGZ7epX8rcg/0BPx21u8Ez3h/su3t3YFS/TfRJk7 qjWREN64lWrKGRdW3sb4mfiiSqcF6EpedtuDSZTFgBN4doo5FNd9oWCY9K3IkCCkPHBd bfHmFI8WUKA1D5/GICn+ishTEwgny0FicCcBKshv2CqCdlR2cthS9EEXae9TIubEg9yc E/rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=gXPXDPT/Vx5XP2+UjnQSXgJOC877/5HHqhfoapbfckM=; b=IOWyQ6Jp+e5jJBdvs4nNst67Nsqth64jS9ZqLpnD2dgx/7z0G4/YydMXGA55ILpyFA VP4jnwo+Rw7bXQgY00S4jqIVi7oR4/4EzF6EzgNNuSBF04+URIAMvVZg4vIHe9sjxRK/ 4f6LGk8HatmSwxWGFBTZJdTNF2gHX3zGez2gvX97/sYIPQB0bPBu5+hXwTNg8Ovz6Dtd AiAOAgf52q9xkcw3UjaPoSdJYBPt0oxbYe7tsV0CMq8ztXdVjPzjOsYM4lbtt5c9LedV QlEOOnFh473tdQaStBZRpIYhoYd4EpgvP8c6o+tos0GFyD97vEcQFv5f49x/5oc2sDlO iB2Q== X-Gm-Message-State: AD7BkJKeuWBQGNJzVKdXI3RONjM5hpkDlN2tDkNzY1RFeB+jEoHbaS8KASRj7RxrtKC3mJ9fzv/1aCRsBOaiNQ== X-Received: by 10.107.3.149 with SMTP id e21mr7109146ioi.46.1459604588162; Sat, 02 Apr 2016 06:43:08 -0700 (PDT) Original-Received: by 10.107.22.69 with HTTP; Sat, 2 Apr 2016 06:42:48 -0700 (PDT) In-Reply-To: <83oa9ss6f7.fsf@gnu.org> 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:115870 Archived-At: On Sat, Apr 2, 2016 at 10:31 AM, Eli Zaretskii wrote: > Refraining from overriding coding-system-for-read/write if they are > already bound is a Good Thing, so I installed that change in the > emacs-25 branch. Thanks. > However, re-reading the original bug report, I'm now confused. > Originally, you said that the ^M characters in the vc-diff output were > correct, and your problem was with applying the hunks. If you now say > that the problem is with those ^M characters, and applying the hunks > after that is no longer a problem, then we can now close this bug. > Please clarify. Indeed, it is a bit confusing, so here's the story: 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. --=20 Jo=C3=A3o T=C3=A1vora