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

Use correct encoding to communicate with Git.

Browse source 
lisp/vc/vc-git.el (vc-git-command, vc-git--call): Bind
 coding-system-for-read and coding-system-for-write to
 vc-git-commits-coding-system.
This commit is contained in:
Eli Zaretskii 2014-11-21 12:26:35 +02:00
parent 30c94ebea1
commit f9b9251f8c
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2014-11-21 Eli Zaretskii <eliz@gnu.org>
* vc/vc-git.el (vc-git-command, vc-git--call): Bind
coding-system-for-read and coding-system-for-write to
vc-git-commits-coding-system.
2014-11-20 Michael Albinus <michael.albinus@gmx.de>
Improve XEmacs compatibility.

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

@ -1209,16 +1209,18 @@ This command shares argument histories with \\[rgrep] and \\[grep]."
"A wrapper around `vc-do-command' for use in vc-git.el.
The difference to vc-do-command is that this function always invokes
`vc-git-program'."
(apply 'vc-do-command (or buffer "*vc*") okstatus vc-git-program
;; http://debbugs.gnu.org/16897
(unless (and (not (cdr-safe file-or-list))
(let ((file (or (car-safe file-or-list)
file-or-list)))
(and file
(eq ?/ (aref file (1- (length file))))
(equal file (vc-git-root file)))))
file-or-list)
(cons "--no-pager" flags)))
(let ((coding-system-for-read vc-git-commits-coding-system)
(coding-system-for-write vc-git-commits-coding-system))
(apply 'vc-do-command (or buffer "*vc*") okstatus vc-git-program
;; http://debbugs.gnu.org/16897
(unless (and (not (cdr-safe file-or-list))
(let ((file (or (car-safe file-or-list)
file-or-list)))
(and file
(eq ?/ (aref file (1- (length file))))
(equal file (vc-git-root file)))))
file-or-list)
(cons "--no-pager" flags))))
(defun vc-git--empty-db-p ()
"Check if the git db is empty (no commit done yet)."
@ -1231,6 +1233,8 @@ The difference to vc-do-command is that this function always invokes
;; directories. We enable `inhibit-null-byte-detection', otherwise
;; Tramp's eol conversion might be confused.
(let ((inhibit-null-byte-detection t)
(coding-system-for-read vc-git-commits-coding-system)
(coding-system-for-write vc-git-commits-coding-system)
(process-environment (cons "PAGER=" process-environment)))
(apply 'process-file vc-git-program nil buffer nil command args)))