diff-hl-fringe-bmp-from-type: Use `exclamation-mark'

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

diff --git a/diff-hl-dired.el b/diff-hl-dired.el
index 20a08a5d85c3cd5002796d0d65309f009f1d2a59..a94be03066d0a9fe4b069a69b5cb638c6ca3c91a 100644 (file)
--- a/diff-hl-dired.el
+++ b/diff-hl-dired.el
@@ -1,13 +1,15 @@
 ;;; diff-hl-dired.el --- Highlight changed files in Dired -*- lexical-binding: t -*-
 
-;; This file is not part of GNU Emacs.
+;; Copyright (C) 2012-2013  Free Software Foundation, Inc.
 
-;; This file is free software: you can redistribute it and/or modify
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; This file is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
@@ -25,18 +27,20 @@
 
 (require 'diff-hl)
 
+(defvar diff-hl-dired-process-buffer nil)
+
+;;;###autoload
 (define-minor-mode diff-hl-dired-mode
-  "Toggle VC diff fringe highlighting in a Dired buffer."
+  "Toggle VC diff highlighting on the side of a Dired window."
   :lighter ""
   (if diff-hl-dired-mode
       (progn
+        (diff-hl-maybe-define-bitmaps)
         (set (make-local-variable 'diff-hl-dired-process-buffer) nil)
         (add-hook 'dired-after-readin-hook 'diff-hl-dired-update nil t))
     (remove-hook 'dired-after-readin-hook 'diff-hl-dired-update t)
     (diff-hl-dired-clear)))
 
-(defvar diff-hl-dired-process-buffer nil)
-
 (defun diff-hl-dired-update ()
   "Highlight the Dired buffer."
   (let ((backend (ignore-errors (vc-responsible-backend default-directory)))
@@ -55,7 +59,7 @@
         (erase-buffer)
         (vc-call-backend
          backend 'dir-status def-dir
-         (lambda (entries &optional more-to-come)
+         (lambda (entries &optional _more-to-come)
            (with-current-buffer buffer
              (dolist (entry entries)
                (cl-destructuring-bind (file state &rest) entry
@@ -70,11 +74,11 @@
                            (if (null value)
                                (push (cons dir type) dirs-alist)
                              (setcdr (assoc dir dirs-alist) 'change))))
-                     (push (cons file type) files-alist))
-                   ;; Process's finished, time to use the results.
-                   (unless (get-buffer-process diff-hl-dired-process-buffer)
-                     (diff-hl-dired-highlight-items (append dirs-alist
-                                                            files-alist))))))))
+                     (push (cons file type) files-alist)))))
+             ;; Process's finished, time to use the results.
+             (unless (get-buffer-process diff-hl-dired-process-buffer)
+               (diff-hl-dired-highlight-items (append dirs-alist
+                                                      files-alist)))))
          )))))
 
 (defun diff-hl-dired-highlight-items (alist)
@@ -86,8 +90,10 @@
         (goto-char (point-min))
         (when (and type (dired-goto-file-1
                          file (expand-file-name file) nil))
-          (forward-line 0)
-          (diff-hl-add-highlighting type 'middle))))))
+          (let* ((diff-hl-fringe-bmp-function 'diff-hl-fringe-bmp-from-type)
+                 (o (diff-hl-add-highlighting type 'single)))
+            (overlay-put o 'modification-hooks '(diff-hl-overlay-modified))
+            ))))))
 
 (defalias 'diff-hl-dired-clear 'diff-hl-remove-overlays)