[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)
- [elpa] master 50e88c2 07/22: Work around debbugs.gnu.org/18605, (continued)
- [elpa] master 50e88c2 07/22: Work around debbugs.gnu.org/18605, Dmitry Gutov, 2015/01/02
- [elpa] master 7466986 08/22: Update copyright year, Dmitry Gutov, 2015/01/02
- [elpa] master f2546ca 09/22: diff-hl-changes: Handle diffs where only file mode changed, Dmitry Gutov, 2015/01/02
- [elpa] master 58615cd 10/22: auto-revert-mode integration, Dmitry Gutov, 2015/01/02
- [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 <=
- [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, 2015/01/02
- [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