[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master cb467b4 20/22: diff-hl-dired-update: Support Emacs 25
From: |
Dmitry Gutov |
Subject: |
[elpa] master cb467b4 20/22: diff-hl-dired-update: Support Emacs 25 |
Date: |
Fri, 02 Jan 2015 23:46:34 +0000 |
branch: master
commit cb467b4a02ac9e0892ead174230adb9b6e1d22ab
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
diff-hl-dired-update: Support Emacs 25
Fixes #28
Fixes #32
---
diff-hl-dired.el | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/diff-hl-dired.el b/diff-hl-dired.el
index 8790f56..09cf851 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
- [elpa] master 8dd7d96 12/22: Don't error out when fringe is disabled, (continued)
- [elpa] master 8dd7d96 12/22: Don't error out when fringe is disabled, Dmitry Gutov, 2015/01/02
- [elpa] master ccaca25 11/22: Merge pull request #30 from sunesimonsen/master, Dmitry Gutov, 2015/01/02
- [elpa] master 9c5004e 13/22: diff-hl-dired-{unknown, ignored}: inherit from dired-ignored instead, Dmitry Gutov, 2015/01/02
- [elpa] master 32951f0 01/22: Add link to an issue, Dmitry Gutov, 2015/01/02
- [elpa] master 788f1fd 14/22: diff-hl-dired-update-ignores: Specifically exclude .hg from iteration, Dmitry Gutov, 2015/01/02
- [elpa] master 469e332 15/22: Add user option `diff-hl-dired-extra-indicators', Dmitry Gutov, 2015/01/02
- [elpa] master bfe57a1 16/22: Use "i" for ignored files, Dmitry Gutov, 2015/01/02
- [elpa] master b4d6dc3 18/22: Introduce diff-hl-dired-mode-unless-remote, Dmitry Gutov, 2015/01/02
- [elpa] master c029ae8 17/22: diff-hl-dired: Always use dir-status-files, Dmitry Gutov, 2015/01/02
- [elpa] master c1351b0 19/22: Collect files only when diff-hl-dired-extra-indicators is non-nil, Dmitry Gutov, 2015/01/02
- [elpa] master cb467b4 20/22: diff-hl-dired-update: Support Emacs 25,
Dmitry Gutov <=
- [elpa] master 6ea154f 21/22: Bump the version, Dmitry Gutov, 2015/01/02
- [elpa] master 8cec226 22/22: Merge commit '6ea154f73f8389abb03c804bb4a4d21c8893861b' from diff-hl, Dmitry Gutov, 2015/01/02