Use "i" for ignored files

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

diff --git a/diff-hl.el b/diff-hl.el
index b78c939b4555a192e804f3b7d772246cb6dc7218..76b68157d3af88a3a3da9982d148962e99022a95 100644 (file)
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -143,7 +143,11 @@
     (define-fringe-bitmap 'diff-hl-bmp-middle middle h w 'center)\r
     (define-fringe-bitmap 'diff-hl-bmp-bottom bottom h w 'bottom)\r
     (define-fringe-bitmap 'diff-hl-bmp-single single h w 'top)\r
+    (define-fringe-bitmap 'diff-hl-bmp-i [3 3 0 3 3 3 3 3 3 3] nil 2 'center)\r
     (let* ((w2 (* (/ w 2) 2))\r
+           ;; When fringes are disabled, it's easier to fix up the width,\r
+           ;; instead of doing nothing (#20).\r
+           (w2 (if (zerop w2) 2 w2))\r
            (delete-row (- (expt 2 (1- w2)) 2))\r
            (middle-pos (1- (/ w2 2)))\r
            (middle-bit (expt 2 middle-pos))\r
@@ -184,7 +188,7 @@
   (cl-case type\r
     (unknown 'question-mark)\r
     (change 'exclamation-mark)\r
-    (ignored 'filled-square)\r
+    (ignored 'diff-hl-bmp-i)\r
     (t (intern (format "diff-hl-bmp-%s" type)))))\r
 \r
 (defvar vc-svn-diff-switches)\r
@@ -449,6 +453,7 @@ in the source file, or the last line of the hunk above it."
         ;; doesn't care about changed VC state.\r
         ;; https://github.com/magit/magit/issues/603\r
         (add-hook 'magit-revert-buffer-hook 'diff-hl-update nil t)\r
+        (add-hook 'auto-revert-mode-hook 'diff-hl-update nil t)\r
         (add-hook 'text-scale-mode-hook 'diff-hl-define-bitmaps nil t))\r
     (remove-hook 'after-save-hook 'diff-hl-update t)\r
     (remove-hook 'after-change-functions 'diff-hl-edit t)\r
@@ -456,6 +461,7 @@ in the source file, or the last line of the hunk above it."
     (remove-hook 'vc-checkin-hook 'diff-hl-update t)\r
     (remove-hook 'after-revert-hook 'diff-hl-update t)\r
     (remove-hook 'magit-revert-buffer-hook 'diff-hl-update t)\r
+    (remove-hook 'auto-revert-mode-hook 'diff-hl-update t)\r
     (remove-hook 'text-scale-mode-hook 'diff-hl-define-bitmaps t)\r
     (diff-hl-remove-overlays)))\r
 \r