From: Dmitry Gutov Date: Mon, 15 Dec 2014 03:06:08 +0000 (+0200) Subject: Use "i" for ignored files X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/bfe57a1ba4f3c003305a0a9e4a5825d012bb732a?hp=469e33265693758766902b8c90ad374293f5472f Use "i" for ignored files --- diff --git a/diff-hl-margin.el b/diff-hl-margin.el index ef3db0a53..26fa7ad78 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 1daab1913..76b68157d 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)