From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#14516: 24.3.50; vc-diff ignores the encoding of its input Date: Mon, 25 Nov 2013 03:27:35 +0200 Message-ID: <87d2lpqni0.fsf@yandex.ru> References: <877gigt9wz.fsf@secretsauce.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1385342895 16476 80.91.229.3 (25 Nov 2013 01:28:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Nov 2013 01:28:15 +0000 (UTC) Cc: 14516@debbugs.gnu.org To: Dima Kogan Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Nov 25 02:28:19 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 1VkkyI-0000GZ-6A for geb-bug-gnu-emacs@m.gmane.org; Mon, 25 Nov 2013 02:28:18 +0100 Original-Received: from localhost ([::1]:49186 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VkkyH-0004pN-EX for geb-bug-gnu-emacs@m.gmane.org; Sun, 24 Nov 2013 20:28:17 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vkky9-0004pF-Bh for bug-gnu-emacs@gnu.org; Sun, 24 Nov 2013 20:28:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vkky3-0004mz-6j for bug-gnu-emacs@gnu.org; Sun, 24 Nov 2013 20:28:09 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:57291) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vkky3-0004mv-3Z for bug-gnu-emacs@gnu.org; Sun, 24 Nov 2013 20:28:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Vkky2-0002O3-9o for bug-gnu-emacs@gnu.org; Sun, 24 Nov 2013 20:28:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 25 Nov 2013 01:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 14516 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 14516-submit@debbugs.gnu.org id=B14516.13853428729150 (code B ref 14516); Mon, 25 Nov 2013 01:28:02 +0000 Original-Received: (at 14516) by debbugs.gnu.org; 25 Nov 2013 01:27:52 +0000 Original-Received: from localhost ([127.0.0.1]:43077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Vkkxq-0002NW-Qh for submit@debbugs.gnu.org; Sun, 24 Nov 2013 20:27:51 -0500 Original-Received: from mail-wg0-f43.google.com ([74.125.82.43]:33984) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Vkkxm-0002ND-NG for 14516@debbugs.gnu.org; Sun, 24 Nov 2013 20:27:47 -0500 Original-Received: by mail-wg0-f43.google.com with SMTP id k14so635985wgh.34 for <14516@debbugs.gnu.org>; Sun, 24 Nov 2013 17:27:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=oY9nhschCE3Q8vwtU6K0OvrFlEoTUpVowS0n9Se+Lew=; b=wU/hOG8aYgcv2G/QzQPIlNecdLRJXXhB9Olhy8pTrdI7t+Ol9/fHswSBHUnaYVbDAN J1JDjTtPCCe2SZyX9BVmGlw8JzWR1hihxUZ1mCS3P11ZY0CYG701H7ha4Itust8X5jNR YM72PU2UNIwmI0C/8P/mZ1W9BmVBbFJ/8dcEBKEfdgjIUSfxHjV1M8Y8kt8YpH13aiUG 8ph6iAc37KJ9toGXMUwNsmewszTZpPrB6xUObhpadkpi8ZsqBOcUe3KlaMgLdltCmpeE +Ul2B+cF0TSESMVCxiOAtwAjp/Qv1xrt/uK7xkP5v88YtLFlBeoxtf1yNGYdhhp89Nuj qc7g== X-Received: by 10.194.5.7 with SMTP id o7mr19699195wjo.17.1385342860487; Sun, 24 Nov 2013 17:27:40 -0800 (PST) Original-Received: from axl ([93.109.200.157]) by mx.google.com with ESMTPSA id b7sm43152472wiz.8.2013.11.24.17.27.38 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 24 Nov 2013 17:27:39 -0800 (PST) In-Reply-To: <877gigt9wz.fsf@secretsauce.net> (Dima Kogan's message of "Thu, 30 May 2013 14:50:04 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) 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:80926 Archived-At: Dima Kogan writes: > 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. I'd prefer a slightly different patch. This way, you have smaller probability of conflict when `vc-setup-buffer' is called from any fuction other than `vc-diff-internal'. And `coding-system-for-read' detection is only peformed for the diff commands. === modified file 'lisp/vc/vc.el' --- lisp/vc/vc.el 2013-11-13 20:06:37 +0000 +++ lisp/vc/vc.el 2013-11-25 01:13:04 +0000 @@ -1642,6 +1642,8 @@ (coding-system-for-read (if files (vc-coding-system-for-diff (car files)) 'undecided))) (vc-setup-buffer buffer) + (when coding-system-for-read + (setq buffer-file-coding-system coding-system-for-read)) (message "%s" (car messages)) ;; Many backends don't handle well the case of a file that has been ;; added but not yet committed to the repo (notably CVS and Subversion).