[Emacs-diffs] emacs/lisp ChangeLog vc-annotate.el

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/09/11 10:58:58

Modified files:
        lisp           : ChangeLog vc-annotate.el 

Log message:
        * vc-annotate.el (vc-annotate): Use the main file's coding-system to
          decode annotated text, regardless of language environment.  (Bug#2741)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16130&r2=1.16131
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-annotate.el?cvsroot=emacs&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16130
retrieving revision 1.16131
diff -u -b -r1.16130 -r1.16131
--- ChangeLog   11 Sep 2009 06:51:06 -0000      1.16130
+++ ChangeLog   11 Sep 2009 10:58:54 -0000      1.16131
@@ -1,3 +1,8 @@
+2009-09-11  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * Makefile.in (autoloads): Make rmail.el writable as well.

Index: vc-annotate.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-annotate.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- vc-annotate.el      10 Mar 2009 00:59:09 -0000      1.8
+++ vc-annotate.el      11 Sep 2009 10:58:58 -0000      1.9
@@ -375,7 +375,8 @@
                ;; 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