From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.bugs Subject: bug#2741: Mixed UTF-8 and raw bytes in output of vc-annotate after (set-language-environment "UTF-8") Date: Thu, 10 Sep 2009 01:18:20 +0200 Message-ID: References: Reply-To: Juanma Barranquero , 2741@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1252538990 6771 80.91.229.12 (9 Sep 2009 23:29:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 9 Sep 2009 23:29:50 +0000 (UTC) Cc: 2741@emacsbugs.donarmstrong.com To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Sep 10 01:29:42 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MlWbe-0002R4-CY for geb-bug-gnu-emacs@m.gmane.org; Thu, 10 Sep 2009 01:29:42 +0200 Original-Received: from localhost ([127.0.0.1]:60046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlWbd-0003tr-I1 for geb-bug-gnu-emacs@m.gmane.org; Wed, 09 Sep 2009 19:29:41 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlWZA-0001vT-KE for bug-gnu-emacs@gnu.org; Wed, 09 Sep 2009 19:27:08 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlWZ5-0001qw-Sw for bug-gnu-emacs@gnu.org; Wed, 09 Sep 2009 19:27:08 -0400 Original-Received: from [199.232.76.173] (port=59188 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlWZ5-0001qq-6N for bug-gnu-emacs@gnu.org; Wed, 09 Sep 2009 19:27:03 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:60123) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MlWZ4-0002Bd-LO for bug-gnu-emacs@gnu.org; Wed, 09 Sep 2009 19:27:02 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n89NQxqh004531; Wed, 9 Sep 2009 16:26:59 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n89NP7Z8004109; Wed, 9 Sep 2009 16:25:07 -0700 Resent-Date: Wed, 9 Sep 2009 16:25:07 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Juanma Barranquero Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Wed, 09 Sep 2009 23:25:07 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: followup 2741 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 2741-submit@emacsbugs.donarmstrong.com id=B2741.12525383283205 (code B ref 2741); Wed, 09 Sep 2009 23:25:07 +0000 Original-Received: (at 2741) by emacsbugs.donarmstrong.com; 9 Sep 2009 23:18:48 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from mail-fx0-f213.google.com (mail-fx0-f213.google.com [209.85.220.213]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n89NIjZM003194 for <2741@emacsbugs.donarmstrong.com>; Wed, 9 Sep 2009 16:18:47 -0700 Original-Received: by fxm9 with SMTP id 9so4199462fxm.1 for <2741@emacsbugs.donarmstrong.com>; Wed, 09 Sep 2009 16:18:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=Q/2MQBT9NPAuhEWB+h1BxZ0G7d6rJvswBP9O65gwIIk=; b=KDJMU+u67g+VwMyOS2YqoFqeT0xvujK3gebn1C9HWXFSSzIwR+q1HKS5D/K8jQ/RXA fKFh6YisT25TJ/W1pY0pUEcXrr0OZ4VNl4OHN0rq2QBXIUbS0oWS96y+7tDkUQaYyixd G1bAsTkSWGLHhTCgsckqFe2evEmSKFZRVZwDk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=dHc7mrDaoX9cDHUu7NbBa/LiuO25ZkYRLA7vNo/UYbrVIyLrypQluwMqFd1SlQ2hat XfAOsy8ZuMoMNtcVCjNlmww4bEPYlgP2BIIQnBObaEikR+4P/poH9h9yrSOjAIc+r7/t Y31bsfcz00aJJvIi4Ob7/dJSrA2ufRdb6qXQs= Original-Received: by 10.239.139.158 with SMTP id t30mr86544hbt.94.1252538320107; Wed, 09 Sep 2009 16:18:40 -0700 (PDT) In-Reply-To: X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Wed, 09 Sep 2009 19:27:08 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:30899 Archived-At: On Sun, Mar 22, 2009 at 03:23, Stefan Monnier wro= te: > I don't see a mixture of anything, I just see latin-1 encoded chars > decoded incorrectly because Emacs somehow decided to try and decode the > stream using the utf-8 coding-system. > But yes that's a bug. =C2=A0`vc-annotate' should use the main file's > coding-system to decode the annotated text, regardless of > language environment. The following patch fixes it. The change is in `vc-annotate' and not `vc-git-annotate-command' because the bug is not git-specific. I can easily reproduce it with bzr, for example. Juanma 2009-09-09 Juanma Barranquero * vc-annotate.el (vc-annotate): Use the main file's coding-system to decode annotated text, regardless of language environment. (Bug#2741) Index: vc-annotate.el =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/emacs/emacs/lisp/vc-annotate.el,v retrieving revision 1.8 diff -u -2 -r1.8 vc-annotate.el --- vc-annotate.el 10 Mar 2009 00:59:09 -0000 1.8 +++ vc-annotate.el 9 Sep 2009 23:11:24 -0000 @@ -376,5 +376,6 @@ (setq temp-buffer-name (buffer-name)))) (with-output-to-temp-buffer temp-buffer-name - (let ((backend (vc-backend file))) + (let ((backend (vc-backend file)) + (coding-system-for-read buffer-file-coding-system)) (vc-call-backend backend 'annotate-command file (get-buffer temp-buffer-name) rev)