emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master bfe57a1 16/22: Use "i" for ignored files


From: Dmitry Gutov
Subject: [elpa] master bfe57a1 16/22: Use "i" for ignored files
Date: Fri, 02 Jan 2015 23:46:32 +0000

branch: master
commit bfe57a1ba4f3c003305a0a9e4a5825d012bb732a
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Use "i" for ignored files
---
 diff-hl-margin.el |    3 ++-
 diff-hl.el        |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/diff-hl-margin.el b/diff-hl-margin.el
index ef3db0a..26fa7ad 100644
--- a/diff-hl-margin.el
+++ b/diff-hl-margin.el
@@ -101,7 +101,8 @@ You probably shouldn't use this function directly."
 
 (defvar diff-hl-margin-spec-cache
   (cl-loop for (type . char) in '((insert . "+") (delete . "-")
-                                  (change . "|") (unknown . "?"))
+                                  (change . "!") (unknown . "?")
+                                  (ignored . "i"))
         nconc
         (cl-loop for side in '(left right)
                  collect
diff --git a/diff-hl.el b/diff-hl.el
index 1daab19..76b6815 100644
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -143,6 +143,7 @@
     (define-fringe-bitmap 'diff-hl-bmp-middle middle h w 'center)
     (define-fringe-bitmap 'diff-hl-bmp-bottom bottom h w 'bottom)
     (define-fringe-bitmap 'diff-hl-bmp-single single h w 'top)
+    (define-fringe-bitmap 'diff-hl-bmp-i [3 3 0 3 3 3 3 3 3 3] nil 2 'center)
     (let* ((w2 (* (/ w 2) 2))
            ;; When fringes are disabled, it's easier to fix up the width,
            ;; instead of doing nothing (#20).
@@ -187,7 +188,7 @@
   (cl-case type
     (unknown 'question-mark)
     (change 'exclamation-mark)
-    (ignored 'filled-square)
+    (ignored 'diff-hl-bmp-i)
     (t (intern (format "diff-hl-bmp-%s" type)))))
 
 (defvar vc-svn-diff-switches)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]