diff-hl-define-bitmaps: Handle text scaling and line spacing better

diff --git a/diff-hl.el b/diff-hl.el
index 4e73bb72a06dc648e8b3efb44af3597a664bb01a..73276c3beb58a302c052ab60758662ee75ea0422 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