From 657bc6fcfdf4ca259b70a9e04c451851cac6fc99 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 11 Sep 2009 10:58:54 +0000 Subject: [PATCH] * vc-annotate.el (vc-annotate): Use the main file's coding-system to decode annotated text, regardless of language environment. (Bug#2741) --- lisp/ChangeLog | 5 +++++ lisp/vc-annotate.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4b9d3faa625..4b03b01e65d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-09-11 Juanma Barranquero + + * vc-annotate.el (vc-annotate): Use the main file's coding-system to + decode annotated text, regardless of language environment. (Bug#2741) + 2009-09-11 Stefan Monnier * Makefile.in (autoloads): Make rmail.el writable as well. diff --git a/lisp/vc-annotate.el b/lisp/vc-annotate.el index 22ff3dac992..6c7ae5a876b 100644 --- a/lisp/vc-annotate.el +++ b/lisp/vc-annotate.el @@ -375,7 +375,8 @@ mode-specific menu. `vc-annotate-color-map' and ;; In case it had to be uniquified. (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) ;; we must setup the mode first, and then set our local