procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASCII-fy coding-system-for-read used for Git commands

Browse source 
* lisp/vc/vc-git.el (vc-git--asciify-coding-system):
New function.
(vc-git-diff, vc-git-annotate-command): Use it.
This commit is contained in:
Dmitry Gutov 2016-06-19 22:08:21 +03:00
parent 2ede29575f
commit dd39c6fbeb
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/vc/vc-git.el
View file

@ -1084,6 +1084,13 @@ or BRANCH^ (where \"^\" can be repeated)."
(cons 'vc-git-region-history-font-lock-keywords
(cdr font-lock-defaults))))
(defun vc-git--asciify-coding-system ()
;; Try to reconcile the content encoding with the encoding of Git's
;; auxiliary output (which is ASCII or ASCII-compatible), bug#23595.
(unless (let ((samp "Binary files differ"))
(string-equal samp (decode-coding-string
samp coding-system-for-read t)))
(setq coding-system-for-read 'undecided)))
(autoload 'vc-switches "vc")
@ -1091,6 +1098,7 @@ or BRANCH^ (where \"^\" can be repeated)."
"Get a difference report using Git between two revisions of FILES."
(let (process-file-side-effects
(command "diff-tree"))
(vc-git--asciify-coding-system)
(if rev2
;; Diffing against the empty tree.
(unless rev1 (setq rev1 "4b825dc642cb6eb9a060e54bf8d69288fbee4904"))
@ -1129,6 +1137,7 @@ or BRANCH^ (where \"^\" can be repeated)."
table))
(defun vc-git-annotate-command (file buf &optional rev)
(vc-git--asciify-coding-system)
(let ((name (file-relative-name file)))
(apply #'vc-git-command buf 'async nil "blame" "--date=short"
(append (vc-switches 'git 'annotate)