Mercurial > emacs
changeset 104949:4fab4cdb3614
* vc-annotate.el (vc-annotate): Use the main file's coding-system to
decode annotated text, regardless of language environment. (Bug#2741)
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Fri, 11 Sep 2009 10:58:54 +0000 |
| parents | 651cfeaedd3a |
| children | 7a82898e4c32 |
| files | lisp/ChangeLog lisp/vc-annotate.el |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Sep 11 10:01:21 2009 +0000 +++ b/lisp/ChangeLog Fri Sep 11 10:58:54 2009 +0000 @@ -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.
--- a/lisp/vc-annotate.el Fri Sep 11 10:01:21 2009 +0000 +++ b/lisp/vc-annotate.el Fri Sep 11 10:58:54 2009 +0000 @@ -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