diff-hl-fringe-bmp-from-type: Use `exclamation-mark'

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

diff --git a/diff-hl.el b/diff-hl.el
index c116a6e5b35e9c0980486bb16ddae6e1129f47ad..d208ccbdd95678e6e977189ac2348713d9cab53a 100644 (file)
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -122,11 +122,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
@@ -152,8 +152,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
@@ -177,9 +176,10 @@
   (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
+    (t (intern (format "diff-hl-bmp-%s" type)))))\r
 \r
 (defvar vc-svn-diff-switches)\r
 \r
@@ -440,6 +440,7 @@ 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 'text-scale-mode-hook 'diff-hl-define-bitmaps nil t))\r
     (remove-hook 'after-save-hook 'diff-hl-update t)\r