From 17b5152d737e74a3b99a98f3be9866facee8865f Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 2 Apr 2016 12:25:15 +0300
Subject: [PATCH] Improve vc-diff with Git backend
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
* 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.
---
lisp/vc/vc-git.el | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 1c43e3ec31a..2921b6470da 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -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.)
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."
- (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
;; the command.
(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.
The difference to vc-do-command is that this function always invokes
`vc-git-program'."
- (let ((coding-system-for-read vc-git-commits-coding-system)
- (coding-system-for-write vc-git-commits-coding-system))
+ (let ((coding-system-for-read
+ (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
;; http://debbugs.gnu.org/16897
(unless (and (not (cdr-safe file-or-list))
--
2.39.5