Merge commit '6ea154f73f8389abb03c804bb4a4d21c8893861b' from diff-hl

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

diff --git a/packages/diff-hl/diff-hl.el b/packages/diff-hl/diff-hl.el
index c116a6e5b35e9c0980486bb16ddae6e1129f47ad..22a877a641353ac42af10828e1801ecd65e3bb93 100644 (file)
--- a/packages/diff-hl/diff-hl.el
+++ b/packages/diff-hl/diff-hl.el
@@ -5,7 +5,7 @@
 ;; Author:   Dmitry Gutov <dgutov@yandex.ru>\r
 ;; URL:      https://github.com/dgutov/diff-hl\r
 ;; Keywords: vc, diff\r
-;; Version:  1.6.0\r
+;; Version:  1.7.0\r
 ;; Package-Requires: ((cl-lib "0.2"))\r
 \r
 ;; This file is part of GNU Emacs.\r
@@ -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
@@ -122,11 +124,11 @@
                          (numberp text-scale-mode-amount))\r
                     (expt text-scale-mode-step text-scale-mode-amount)\r
                   1))\r
-         (spacing (or (default-value 'line-spacing) 0))\r
-         (h (round (+ (* (frame-char-height) scale)\r
-                      (if (floatp spacing)\r
-                          (* (frame-char-height) spacing)\r
-                        spacing))))\r
+         (spacing (or (and (display-graphic-p) (default-value 'line-spacing)) 0))\r
+         (h (+ (ceiling (* (frame-char-height) scale))\r
+               (if (floatp spacing)\r
+                   (truncate (* (frame-char-height) spacing))\r
+                 spacing)))\r
          (w (frame-parameter nil 'left-fringe))\r
          (middle (make-vector h (expt 2 (1- w))))\r
          (ones (1- (expt 2 w)))\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
@@ -152,8 +158,7 @@
       (aset insert-bmp (1+ middle-pos) delete-row)\r
       (aset insert-bmp (1- w2) 0)\r
       (define-fringe-bitmap 'diff-hl-bmp-insert insert-bmp w2 w2)\r
-      (define-fringe-bitmap 'diff-hl-bmp-change (make-vector\r
-                                                 w2 (* 3 middle-bit)) w2 w2))))\r
+      )))\r
 \r
 (defun diff-hl-maybe-define-bitmaps ()\r
   (when (window-system) ;; No fringes in the console.\r
@@ -167,19 +172,24 @@
   (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
 (defun diff-hl-fringe-bmp-from-type (type _pos)\r
-  (if (eq type 'unknown)\r
-      'question-mark\r
-    (intern (format "diff-hl-bmp-%s" type))))\r
+  (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
 \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
@@ -440,7 +451,9 @@ in the source file, or the last line of the hunk above it."
         ;; Magit does call `auto-revert-handler', but it usually\r
         ;; doesn't do much, because `buffer-stale--default-function'\r
         ;; 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
@@ -448,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