[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master 4a6f27b 1/2: Add vdiff-only-highlight-refinements option

From: Justin Burkett
Subject: [elpa] master 4a6f27b 1/2: Add vdiff-only-highlight-refinements option
Date: Tue, 23 May 2017 08:26:02 -0400 (EDT)

branch: master
commit 4a6f27b83ef0240c56587354277ba685d9834bc9
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>

    Add vdiff-only-highlight-refinements option
    * vdiff.el (vdiff-only-highlight-refinements): Add option
    (vdiff-refine-this-hunk): Handle new option
    (vdiff-remove-refinements-in-hunk): Handle new option
 vdiff.el | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/vdiff.el b/vdiff.el
index 5ca2605..ec0b793 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -118,6 +118,10 @@ 
   "If non-nil, automatically refine all hunks."
   :type 'boolean)
+(defcustom vdiff-only-highlight-refinements nil
+  "If non-nil, apply faces to refined words but not hunks."
+  :type 'boolean)
 (defcustom vdiff-subtraction-style 'full
   "How to represent subtractions (i.e., deleted lines). The
 default is full which means add the same number of (fake) lines
@@ -750,7 +754,12 @@ SYNTAX-CODE."
                     (overlay-put word-ovr 'vdiff t)
                     (overlay-put word-ovr 'face face)
                     (overlay-put word-ovr 'vdiff-refinement t)
-                    (skip-syntax-forward not-word-syn)))))))))))
+                    (skip-syntax-forward not-word-syn)))))))))
+    (when vdiff-only-highlight-refinements
+      (when ovr
+        (overlay-put ovr 'face nil))
+      (when target-ovr
+        (overlay-put target-ovr 'face nil)))))
 ;; Not working yet
 ;; (defun vdiff-refine-this-hunk-whitespace (ovr)
@@ -777,7 +786,11 @@ SYNTAX-CODE."
                         (overlay-start chg-ovr)
                         (overlay-end chg-ovr)))
         (when (overlay-get sub-ovr 'vdiff-refinement)
-          (delete-overlay sub-ovr))))))
+          (delete-overlay sub-ovr))))
+    (when vdiff-only-highlight-refinements
+      (cl-case (overlay-get chg-ovr 'vdiff-type)
+        (addition (overlay-put chg-ovr 'face 'vdiff-addition-face))
+        (change (overlay-put chg-ovr 'face 'vdiff-change-face))))))
 (defun vdiff-refine-all-hunks (&optional syntax-code)
   "Highlight word differences in all hunks.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]