;; Author: Dmitry Gutov <dgutov@yandex.ru>\r
;; URL: https://github.com/dgutov/diff-hl\r
;; Keywords: vc, diff\r
-;; Version: 1.3.6\r
-;; Package-Depends: ((cl-lib "0.2"))\r
+;; Version: 1.4.6\r
+;; Package-Requires: ((cl-lib "0.2"))\r
\r
;; This file is not part of GNU Emacs.\r
\r
:group 'vc)\r
\r
(defface diff-hl-insert\r
- '((t :inherit diff-added))\r
+ '((default :inherit diff-added)\r
+ (((class color)) :foreground "green4"))\r
"Face used to highlight inserted lines."\r
:group 'diff-hl)\r
\r
(defface diff-hl-delete\r
- '((t :inherit diff-removed))\r
+ '((default :inherit diff-removed)\r
+ (((class color)) :foreground "red3"))\r
"Face used to highlight deleted lines."\r
:group 'diff-hl)\r
\r
(defface diff-hl-change\r
- '((default\r
- :foreground "blue")\r
+ '((default :foreground "blue3")\r
(((class color) (min-colors 88) (background light))\r
:background "#ddddff")\r
(((class color) (min-colors 88) (background dark))\r
:group 'diff-hl\r
:type 'boolean)\r
\r
+(defvar diff-hl-reference-revision nil\r
+ "Revision to diff against. nil means the most recent one.")\r
+\r
(defun diff-hl-define-bitmaps ()\r
(let* ((scale (if (and (boundp 'text-scale-mode-amount)\r
- (cl-plusp text-scale-mode-amount))\r
+ (numberp text-scale-mode-amount))\r
(expt text-scale-mode-step text-scale-mode-amount)\r
1))\r
- (h (round (* (frame-char-height) scale)))\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
(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-bottom bottom h w 'bottom)\r
(define-fringe-bitmap 'diff-hl-bmp-single single h w 'top)))\r
\r
-(when (window-system)\r
- (define-fringe-bitmap 'diff-hl-bmp-empty [0] 1 1 'center)\r
- (diff-hl-define-bitmaps))\r
-\r
(defvar diff-hl-spec-cache (make-hash-table :test 'equal))\r
\r
(defun diff-hl-fringe-spec (type pos)\r
(defmacro diff-hl-with-diff-switches (body)\r
`(let ((vc-git-diff-switches nil)\r
(vc-hg-diff-switches nil)\r
+ (vc-svn-diff-switches nil)\r
(vc-diff-switches '("-U0"))\r
(vc-disable-async-diff t))\r
,body))\r
\r
(defun diff-hl-changes ()\r
- (let* ((buf-name " *diff-hl* ")\r
- (file buffer-file-name)\r
- (backend (vc-backend file))\r
- res)\r
- (when (and backend (eq (vc-state file backend) 'edited))\r
- (diff-hl-with-diff-switches\r
- (vc-call-backend backend 'diff (list file) nil nil buf-name))\r
- (with-current-buffer buf-name\r
- (goto-char (point-min))\r
- (unless (eobp)\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
- (if m (string-to-number m) 1)))\r
- (beg (point)))\r
- (diff-end-of-hunk)\r
- (let* ((inserts (diff-count-matches "^\\+" beg (point)))\r
- (deletes (diff-count-matches "^-" beg (point)))\r
- (type (cond ((zerop deletes) 'insert)\r
- ((zerop inserts) 'delete)\r
- (t 'change))))\r
- (push (list line len type) res)))))))\r
- (nreverse res)))\r
+ (let* ((file buffer-file-name)\r
+ (backend (vc-backend file)))\r
+ (when backend\r
+ (let ((state (vc-state file backend)))\r
+ (cond\r
+ ((or (eq state 'edited)\r
+ (and (eq state 'up-to-date)\r
+ ;; VC state is stale in after-revert-hook.\r
+ (or revert-buffer-in-progress-p\r
+ ;; Diffing against an older revision.\r
+ diff-hl-reference-revision)))\r
+ (let* ((buf-name " *diff-hl* ")\r
+ diff-auto-refine-mode\r
+ res)\r
+ (diff-hl-with-diff-switches\r
+ (vc-call-backend backend 'diff (list file)\r
+ diff-hl-reference-revision nil\r
+ buf-name))\r
+ (with-current-buffer buf-name\r
+ (goto-char (point-min))\r
+ (unless (eobp)\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
+ (if m (string-to-number m) 1)))\r
+ (beg (point)))\r
+ (diff-end-of-hunk)\r
+ (let* ((inserts (diff-count-matches "^\\+" beg (point)))\r
+ (deletes (diff-count-matches "^-" beg (point)))\r
+ (type (cond ((zerop deletes) 'insert)\r
+ ((zerop inserts) 'delete)\r
+ (t 'change))))\r
+ (when (eq type 'delete)\r
+ (setq len 1)\r
+ (cl-incf line))\r
+ (push (list line len type) res))))))\r
+ (nreverse res)))\r
+ ((eq state 'added)\r
+ `((1 ,(line-number-at-pos (point-max)) insert)))\r
+ ((eq state 'removed)\r
+ `((1 ,(line-number-at-pos (point-max)) delete))))))))\r
\r
(defun diff-hl-update ()\r
(let ((changes (diff-hl-changes))\r
(goto-char (point-min))\r
(dolist (c changes)\r
(cl-destructuring-bind (line len type) c\r
- (when (eq type 'delete)\r
- (setq len 1)\r
- (cl-incf line))\r
(forward-line (- line current-line))\r
(setq current-line line)\r
(let ((hunk-beg (point)))\r
(while (cl-plusp len)\r
- (let ((o (make-overlay (point) (line-end-position))))\r
+ (let ((o (make-overlay (point) (point))))\r
(overlay-put o 'diff-hl t)\r
(overlay-put o 'before-string\r
(diff-hl-fringe-spec\r
(overlay-put h 'diff-hl t)\r
(overlay-put h 'diff-hl-hunk t)\r
(overlay-put h 'modification-hooks hook)\r
- (overlay-put h 'insert-in-front-hooks hook))))))))\r
+ (overlay-put h 'insert-in-front-hooks hook)\r
+ (overlay-put h 'insert-behind-hooks hook))))))))\r
\r
(defun diff-hl-remove-overlays ()\r
(dolist (o (overlays-in (point-min) (point-max)))\r
(when (overlay-get o 'diff-hl) (delete-overlay o))))\r
\r
(defun diff-hl-overlay-modified (ov after-p _beg _end &optional _length)\r
- "Delete the overlay and all our overlays inside it."\r
+ "Delete the hunk overlay and all our line overlays inside it."\r
(unless after-p\r
(when (overlay-buffer ov)\r
(save-restriction\r
(vc-buffer-sync)\r
(let* ((line (line-number-at-pos))\r
(buffer (current-buffer)))\r
- (vc-diff-internal t (vc-deduce-fileset) nil nil t)\r
+ (vc-diff-internal t (vc-deduce-fileset) diff-hl-reference-revision nil t)\r
(vc-exec-after `(if (< (line-number-at-pos (point-max)) 3)\r
(with-current-buffer ,buffer (diff-hl-remove-overlays))\r
(diff-hl-diff-skip-to ,line)\r
(fileset (vc-deduce-fileset)))\r
(unwind-protect\r
(progn\r
- (vc-diff-internal nil fileset nil nil nil diff-buffer)\r
+ (vc-diff-internal nil fileset diff-hl-reference-revision nil\r
+ nil diff-buffer)\r
(vc-exec-after\r
`(let (beg-line end-line)\r
(when (eobp)\r
(quit-windows-on diff-buffer))))\r
\r
(defun diff-hl-hunk-overlay-at (pos)\r
- (cl-loop for o in (overlays-at pos)\r
+ (cl-loop for o in (overlays-in pos (1+ pos))\r
when (overlay-get o 'diff-hl-hunk)\r
return o))\r
\r
(previous-overlay-change (point))\r
(next-overlay-change (point))))\r
(let ((o (diff-hl-hunk-overlay-at (point))))\r
- (when (and o (if backward\r
- (<= (overlay-end o) (1+ (point)))\r
- (>= (overlay-start o) (point))))\r
+ (when (and o (= (overlay-start o) (point)))\r
(throw 'found (overlay-start o)))))))))\r
(if pos\r
(goto-char pos)\r
(,(kbd "C-x v ]") . diff-hl-next-hunk))\r
(if diff-hl-mode\r
(progn\r
+ (when (window-system) ;; No fringes in the console.\r
+ (unless (fringe-bitmap-p 'diff-hl-bmp-empty)\r
+ (diff-hl-define-bitmaps)\r
+ (define-fringe-bitmap 'diff-hl-bmp-empty [0] 1 1 'center)))\r
(add-hook 'after-save-hook 'diff-hl-update nil t)\r
(add-hook 'after-change-functions 'diff-hl-edit nil t)\r
(if vc-mode\r
;;;###autoload\r
(defun turn-on-diff-hl-mode ()\r
"Turn on `diff-hl-mode' or `diff-hl-dir-mode' in a buffer if appropriate."\r
- (when (window-system) ;; No fringes in the console.\r
- (cond\r
- (buffer-file-name\r
- (diff-hl-mode 1))\r
- ((eq major-mode 'vc-dir-mode)\r
- (diff-hl-dir-mode 1)))))\r
+ (cond\r
+ (buffer-file-name\r
+ (diff-hl-mode 1))\r
+ ((eq major-mode 'vc-dir-mode)\r
+ (diff-hl-dir-mode 1))))\r
+\r
+;;;###autoload\r
+(define-globalized-minor-mode global-diff-hl-mode diff-hl-mode\r
+ turn-on-diff-hl-mode :after-hook (diff-hl-global-mode-change))\r
\r
(defun diff-hl-global-mode-change ()\r
(unless global-diff-hl-mode\r
(when diff-hl-dir-mode\r
(diff-hl-dir-mode -1))))))\r
\r
-;;;###autoload\r
-(define-globalized-minor-mode global-diff-hl-mode diff-hl-mode\r
- turn-on-diff-hl-mode :after-hook (diff-hl-global-mode-change))\r
-\r
(provide 'diff-hl)\r
\r
;;; diff-hl.el ends here\r