Add diff-hl-amend-mode

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

diff --git a/diff-hl.el b/diff-hl.el
index abfe988c0dcf240f31723154104473490ac042d9..506ae31ad774b7cc245ec8341f933ab01e775aa7 100644 (file)
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -3,7 +3,7 @@
 ;; Author:   Dmitry Gutov <dgutov@yandex.ru>\r
 ;; URL:      https://github.com/dgutov/diff-hl\r
 ;; Keywords: vc, diff\r
-;; Version:  1.4.4\r
+;; Version:  1.4.6\r
 ;; Package-Requires: ((cl-lib "0.2"))\r
 \r
 ;; This file is not part of GNU Emacs.\r
@@ -87,12 +87,19 @@
   :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
@@ -137,11 +144,16 @@
          ((or (eq state 'edited)\r
               (and (eq state 'up-to-date)\r
                    ;; VC state is stale in after-revert-hook.\r
-                   revert-buffer-in-progress-p))\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) nil nil buf-name))\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
@@ -176,17 +188,27 @@
       (dolist (c changes)\r
         (cl-destructuring-bind (line len type) c\r
           (forward-line (- line current-line))\r
+          (setq current-line line)\r
           (let ((hunk-beg (point)))\r
-            (forward-line len)\r
-            (setq current-line (+ line len))\r
-            (let ((h (make-overlay hunk-beg (1- (point))))\r
+            (while (cl-plusp len)\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
+                              type\r
+                              (cond\r
+                               ((not diff-hl-draw-borders) 'empty)\r
+                               ((and (= len 1) (= line current-line)) 'single)\r
+                               ((= len 1) 'bottom)\r
+                               ((= line current-line) 'top)\r
+                               (t 'middle)))))\r
+              (forward-line 1)\r
+              (cl-incf current-line)\r
+              (cl-decf len))\r
+            (let ((h (make-overlay hunk-beg (point)))\r
                   (hook '(diff-hl-overlay-modified)))\r
               (overlay-put h 'diff-hl t)\r
-              (if (= len 1)\r
-                  (overlay-put h 'before-string (diff-hl-fringe-spec type 'single))\r
-                (overlay-put h 'before-string (diff-hl-fringe-spec type 'top))\r
-                (overlay-put h 'line-prefix (diff-hl-fringe-spec type 'middle))\r
-                (overlay-put h 'after-string (diff-hl-fringe-spec type 'bottom)))\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-behind-hooks hook))))))))\r
@@ -196,9 +218,12 @@
     (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."\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
+        (narrow-to-region (overlay-start ov) (overlay-end ov))\r
+        (diff-hl-remove-overlays))\r
       (delete-overlay ov))))\r
 \r
 (defvar diff-hl-timer nil)\r
@@ -222,7 +247,7 @@
   (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
@@ -262,7 +287,8 @@ in the source file, or the last line of the hunk above it."
         (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
@@ -295,7 +321,7 @@ in the source file, or the last line of the hunk above it."
 \r
 (defun diff-hl-hunk-overlay-at (pos)\r
   (cl-loop for o in (overlays-in pos (1+ pos))\r
-           when (overlay-get o 'diff-hl)\r
+           when (overlay-get o 'diff-hl-hunk)\r
            return o))\r
 \r
 (defun diff-hl-next-hunk (&optional backward)\r