* vc-annotate.el (vc-annotate): Use the main file's coding-system to

  decode annotated text, regardless of language environment.  (Bug#2741)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4b9d3faa62538dfb072dc6a4d2e53b0d1d6a79d3..4b03b01e65daed99ba5aa85bf2bc6af6f1e5cc61 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-11  Juanma Barranquero  <lekktu@gmail.com>
+
+       * 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  <monnier@iro.umontreal.ca>
 
        * Makefile.in (autoloads): Make rmail.el writable as well.

diff --git a/lisp/vc-annotate.el b/lisp/vc-annotate.el
index 22ff3dac9924f2ec5012ef2ee910bc032b26a849..6c7ae5a876b67135ae90911d4986edc93e5824cb 100644 (file)
--- 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