Allow using --patience through vc-git-diff-switches

[gnu-emacs-elpa] / diff-hl.el

diff --git a/diff-hl.el b/diff-hl.el
index 106a487efb13675ec9006b240666bd37158a28e2..c52bf0e2a3f43aac5737d6f31983e3b44ec0e422 100644 (file)
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -209,8 +209,15 @@
 (defvar vc-svn-diff-switches)
 
 (defmacro diff-hl-with-diff-switches (body)
-  ;; https://github.com/dgutov/diff-hl/issues/67
-  `(let ((vc-git-diff-switches '("-U0"))
+  `(let ((vc-git-diff-switches
+          ;; https://github.com/dgutov/diff-hl/issues/67
+          (cons "-U0"
+                ;; https://github.com/dgutov/diff-hl/issues/9
+                (and (listp vc-git-diff-switches)
+                     (cl-remove-if-not
+                      (lambda (arg)
+                        (member arg '("--histogram" "--patience" "--minimal")))
+                      vc-git-diff-switches))))
          (vc-hg-diff-switches nil)
          (vc-svn-diff-switches nil)
          (vc-diff-switches '("-U0"))