branch: master
commit 4925dde3996db902398b771b568072373e337fa4
Merge: 4bfa149 4ad3ca9
Author: Dmitry Gutov <[email protected]>
Commit: Dmitry Gutov <[email protected]>
Merge pull request #70 from jpkotta/master
don't assume vc-git-diff-switches is defined
---
diff-hl.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/diff-hl.el b/diff-hl.el
index c52bf0e..017e5ca 100644
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -213,7 +213,8 @@
;; https://github.com/dgutov/diff-hl/issues/67
(cons "-U0"
;; https://github.com/dgutov/diff-hl/issues/9
- (and (listp vc-git-diff-switches)
+ (and (boundp 'vc-git-diff-switches)
+ (listp vc-git-diff-switches)
(cl-remove-if-not
(lambda (arg)
(member arg '("--histogram" "--patience" "--minimal")))
