From: Dmitry Gutov <dgutov@yandex.ru>
Date: Wed, 17 Dec 2014 03:47:09 +0000 (+0200)
Subject: diff-hl-dired-update: Support Emacs 25
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/cb467b4a02ac9e0892ead174230adb9b6e1d22ab

diff-hl-dired-update: Support Emacs 25

Fixes #28
Fixes #32
---

diff --git a/diff-hl-dired.el b/diff-hl-dired.el
index 8790f5632..09cf851cc 100644
--- a/diff-hl-dired.el
+++ b/diff-hl-dired.el
@@ -93,13 +93,12 @@
       (with-current-buffer diff-hl-dired-process-buffer
         (setq default-directory (expand-file-name def-dir))
         (erase-buffer)
-        (vc-call-backend
-         backend 'dir-status-files def-dir
+        (diff-hl-dired-status-files
+         backend def-dir
          (when diff-hl-dired-extra-indicators
            (cl-loop for file in (directory-files def-dir)
                     unless (member file '("." ".." ".hg"))
                     collect file))
-         nil
          (lambda (entries &optional more-to-come)
            (when (buffer-live-p buffer)
              (with-current-buffer buffer
@@ -127,6 +126,11 @@
                   (append dirs-alist files-alist))))))
          )))))
 
+(defun diff-hl-dired-status-files (backend dir files uf)
+  (if (version< "25" emacs-version)
+      (vc-call-backend backend 'dir-status-files dir files uf)
+    (vc-call-backend backend 'dir-status-files dir files nil uf)))
+
 (when (version< emacs-version "24.4.51.5")
   ;; Work around http://debbugs.gnu.org/19386
   (defadvice vc-git-dir-status-goto-stage (around