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

Improve vc-diff with Git backend

Browse source 
* lisp/vc/vc-git.el (vc-git-command): Don't override
coding-system-for-read/write if they are already bound.
Suggested by joaotavora@gmail.com (João Távora).  (Bug#20892)
(vc-git-print-log): Don't override coding-system-for-read if it's
already bound.
This commit is contained in:
Eli Zaretskii 2016-04-02 12:25:15 +03:00
parent c28f87a53d
commit 17b5152d73
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -853,7 +853,8 @@ If SHORTLOG is non-nil, use a short format based on `vc-git-root-log-format'.
\(This requires at least Git version 1.5.6, for the --graph option.) \(This requires at least Git version 1.5.6, for the --graph option.)
If START-REVISION is non-nil, it is the newest revision to show. If START-REVISION is non-nil, it is the newest revision to show.
If LIMIT is non-nil, show no more than this many entries." If LIMIT is non-nil, show no more than this many entries."
(let ((coding-system-for-read vc-git-commits-coding-system)) (let ((coding-system-for-read
(or coding-system-for-read vc-git-commits-coding-system)))
;; `vc-do-command' creates the buffer, but we need it before running ;; `vc-do-command' creates the buffer, but we need it before running
;; the command. ;; the command.
(vc-setup-buffer buffer) (vc-setup-buffer buffer)
@ -1385,8 +1386,10 @@ This command shares argument histories with \\[rgrep] and \\[grep]."
"A wrapper around `vc-do-command' for use in vc-git.el. "A wrapper around `vc-do-command' for use in vc-git.el.
The difference to vc-do-command is that this function always invokes The difference to vc-do-command is that this function always invokes
`vc-git-program'." `vc-git-program'."
(let ((coding-system-for-read vc-git-commits-coding-system) (let ((coding-system-for-read
(coding-system-for-write vc-git-commits-coding-system)) (or coding-system-for-read vc-git-commits-coding-system))
(coding-system-for-write
(or coding-system-for-write vc-git-commits-coding-system)))
(apply 'vc-do-command (or buffer "*vc*") okstatus vc-git-program (apply 'vc-do-command (or buffer "*vc*") okstatus vc-git-program
;; http://debbugs.gnu.org/16897 ;; http://debbugs.gnu.org/16897
(unless (and (not (cdr-safe file-or-list)) (unless (and (not (cdr-safe file-or-list))