Introduce diff-hl-dired-mode-unless-remote

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

diff --git a/diff-hl.el b/diff-hl.el
index d208ccbdd95678e6e977189ac2348713d9cab53a..76b68157d3af88a3a3da9982d148962e99022a95 100644 (file)
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -86,10 +86,6 @@
   "Face used to highlight changed lines."\r
   :group 'diff-hl)\r
 \r
-(defface diff-hl-unknown\r
-  '((default :inherit diff-header))\r
-  "Face used to highlight unregistered files.")\r
-\r
 (defcustom diff-hl-command-prefix (kbd "C-x v")\r
   "The prefix for all `diff-hl' commands."\r
   :group 'diff-hl\r
@@ -114,6 +110,12 @@
                  (const diff-hl-fringe-bmp-from-type)\r
                  function))\r
 \r
+(defcustom diff-hl-fringe-face-function 'diff-hl-fringe-face-from-type\r
+  "Function to choose the fringe face for a given change type\r
+  and position within a hunk.  Should accept two arguments."\r
+  :group 'diff-hl\r
+  :type 'function)\r
+\r
 (defvar diff-hl-reference-revision nil\r
   "Revision to diff against.  nil means the most recent one.")\r
 \r
@@ -141,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
@@ -166,12 +172,15 @@
   (let* ((key (list type pos diff-hl-fringe-bmp-function))\r
          (val (gethash key diff-hl-spec-cache)))\r
     (unless val\r
-      (let* ((face-sym (intern (format "diff-hl-%s" type)))\r
+      (let* ((face-sym (funcall diff-hl-fringe-face-function type pos))\r
              (bmp-sym (funcall diff-hl-fringe-bmp-function type pos)))\r
         (setq val (propertize " " 'display `((left-fringe ,bmp-sym ,face-sym))))\r
         (puthash key val diff-hl-spec-cache)))\r
     val))\r
 \r
+(defun diff-hl-fringe-face-from-type (type _pos)\r
+  (intern (format "diff-hl-%s" type)))\r
+\r
 (defun diff-hl-fringe-bmp-from-pos (_type pos)\r
   (intern (format "diff-hl-bmp-%s" pos)))\r
 \r
@@ -179,6 +188,7 @@
   (cl-case type\r
     (unknown 'question-mark)\r
     (change 'exclamation-mark)\r
+    (ignored 'diff-hl-bmp-i)\r
     (t (intern (format "diff-hl-bmp-%s" type)))))\r
 \r
 (defvar vc-svn-diff-switches)\r
@@ -213,7 +223,8 @@
             (with-current-buffer buf-name\r
               (goto-char (point-min))\r
               (unless (eobp)\r
-                (diff-beginning-of-hunk t)\r
+                (ignore-errors\r
+                  (diff-beginning-of-hunk t))\r
                 (while (looking-at diff-hunk-header-re-unified)\r
                   (let ((line (string-to-number (match-string 3)))\r
                         (len (let ((m (match-string 4)))\r
@@ -442,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
@@ -449,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