From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dima Kogan Newsgroups: gmane.emacs.bugs Subject: bug#14516: 24.3.50; vc-diff ignores the encoding of its input Date: Thu, 30 May 2013 14:50:04 -0700 Message-ID: <877gigt9wz.fsf@secretsauce.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1369950708 6549 80.91.229.3 (30 May 2013 21:51:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 30 May 2013 21:51:48 +0000 (UTC) To: 14516@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu May 30 23:51:48 2013 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 1UiAl9-00089f-M5 for geb-bug-gnu-emacs@m.gmane.org; Thu, 30 May 2013 23:51:48 +0200 Original-Received: from localhost ([::1]:48463 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UiAl9-0001wj-CB for geb-bug-gnu-emacs@m.gmane.org; Thu, 30 May 2013 17:51:47 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UiAkz-0001uz-NA for bug-gnu-emacs@gnu.org; Thu, 30 May 2013 17:51:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UiAkt-0001fC-ED for bug-gnu-emacs@gnu.org; Thu, 30 May 2013 17:51:37 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:54762) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UiAkt-0001f6-B1 for bug-gnu-emacs@gnu.org; Thu, 30 May 2013 17:51:31 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1UiAmM-00049l-Jn for bug-gnu-emacs@gnu.org; Thu, 30 May 2013 17:53:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dima Kogan Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 30 May 2013 21:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 14516 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.136995073115841 (code B ref -1); Thu, 30 May 2013 21:53:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 30 May 2013 21:52:11 +0000 Original-Received: from localhost ([127.0.0.1]:43120 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UiAlX-00047Q-AI for submit@debbugs.gnu.org; Thu, 30 May 2013 17:52:11 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:47481) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UiAlS-00046k-Eb for submit@debbugs.gnu.org; Thu, 30 May 2013 17:52:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UiAjl-0001UW-Qh for submit@debbugs.gnu.org; Thu, 30 May 2013 17:50:30 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:47263) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UiAjl-0001UR-MC for submit@debbugs.gnu.org; Thu, 30 May 2013 17:50:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UiAjf-0001WM-D4 for bug-gnu-emacs@gnu.org; Thu, 30 May 2013 17:50:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UiAjZ-0001PV-1E for bug-gnu-emacs@gnu.org; Thu, 30 May 2013 17:50:15 -0400 Original-Received: from out1-smtp.messagingengine.com ([66.111.4.25]:41092) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UiAjY-0001NI-L6 for bug-gnu-emacs@gnu.org; Thu, 30 May 2013 17:50:08 -0400 Original-Received: from compute5.internal (compute5.nyi.mail.srv.osa [10.202.2.45]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id C1B0720E23 for ; Thu, 30 May 2013 17:50:06 -0400 (EDT) Original-Received: from frontend1.nyi.mail.srv.osa ([unixlocal]) by compute5.internal (MEProxy); Thu, 30 May 2013 17:50:06 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=secretsauce.net; h=from:to:subject:date:message-id:mime-version:content-type; s= mesmtp; bh=4MRXOaV7An7lJl2Lq0z5qsE/J68=; b=p6KR6u/nqSW2eErWbl/J2 VUd8kZsOKrYvNS5wyEnHNLGuKR9D4OLkd9VOOCfxWklqIth99Ehh5AJik/Ujfxiy IhuimDDhhqLkaove/iLB2ygJEOwT/sIknLzgDPh79NMkmzz5mZ3QMce+iZUcy20/ 6/sfLSZ6u72MT+9fWEPCtU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=from:to:subject:date:message-id :mime-version:content-type; s=smtpout; bh=4MRXOaV7An7lJl2Lq0z5qs E/J68=; b=fSz+6eqdZAziVwKbZRdsBEXUTcVXtsxCmPruW+86uSyR8nrUHngsKN ddZS9/SvuQ24EWCCNvwbAEy5Z7Arks1VjDkb0O3bfCQ++tNqJskc+1vwN/ckGVGT akOxe8Z2JLap91YF4uEDKdAaAtIok0UhalhgrfjbNYY9Hvt1EHIC4= X-Sasl-enc: EGmv/4Ao1NhtKMERhV1GRqHz2ybMGxV9GtScn9z0zBGP 1369950606 Original-Received: from shorty.local (unknown [76.169.247.77]) by mail.messagingengine.com (Postfix) with ESMTPA id 69D8CC8000A for ; Thu, 30 May 2013 17:50:06 -0400 (EDT) Original-Received: from dima by shorty.local with local (Exim 4.80) (envelope-from ) id 1UiAjV-0000v7-7H for bug-gnu-emacs@gnu.org; Thu, 30 May 2013 14:50:05 -0700 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.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:74688 Archived-At: --=-=-= Content-Type: text/plain I'm using a very recent build of the emacs source repo on a Linux box. I have a file that uses DOS-style line termination. This file is in git and has some modifications. I use (vc-diff) to get a buffer that shows those modifications. Currently this buffer is NOT set to use the DOS encoding, and emacs does a conversion, so this buffer is missing the extra CR characters the DOS encoding had. Because of this, if I save this buffer to a file, external tools can no longer be used to apply the patch. I'm attaching a tiny git repository that demonstrates the issue: dima@shorty:/tmp$ tar xvfz vc_encoding_error_test_repo.tar.gz vc_encoding_error_test_repo/ vc_encoding_error_test_repo/file dima@shorty:/tmp$ cd vc_encoding_error_test_repo dima@shorty:/tmp/vc_encoding_error_test_repo$ emacs --batch --eval '(progn (find-file "file") (vc-diff) (with-current-buffer "*vc-diff*" (write-file "/tmp/patch")))' -Q Finding changes in /tmp/vc_encoding_error_test_repo/file... Saving file /tmp/patch... Wrote /tmp/patch dima@shorty:/tmp/vc_encoding_error_test_repo$ git apply --cached /tmp/patch error: patch failed: file:1 error: file: patch does not apply Here we see git fail to apply the saved patch. This is due to the stripped CR characters. VC already has code in it to detect the encoding of its input. I'm attaching a small patch that sets this detected encoding to the *vc-diff* buffer. This fixes the issue. --=-=-= Content-Type: application/octet-stream Content-Disposition: attachment; filename=vc_encoding_error_test_repo.tar.gz Content-Transfer-Encoding: base64 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 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-vc-buffers-now-use-the-encoding-of-their-input.patch >From fd04b0d03f61344a4c9a37cafc86495c79a46d19 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Thu, 30 May 2013 14:17:08 -0700 Subject: [PATCH] vc buffers now use the encoding of their input --- lisp/vc/vc-dispatcher.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index 309cf50..1bada72 100644 --- a/lisp/vc/vc-dispatcher.el +++ b/lisp/vc/vc-dispatcher.el @@ -178,7 +178,9 @@ Another is that undo information is not kept." (setq default-directory olddir) (let ((buffer-undo-list t) (inhibit-read-only t)) - (erase-buffer)))) + (erase-buffer)) + (when coding-system-for-read + (setq buffer-file-coding-system coding-system-for-read)))) (defvar vc-sentinel-movepoint) ;Dynamically scoped. -- 1.7.10.4 --=-=-=--