;; 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
"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
(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
(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
(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
(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
(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
(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
;; 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
(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