emacs-elpa-diffs
[Top][All Lists]
Advanced

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

[elpa] scratch/add-vdiff 477eb88 161/258: Fix refinement bug


From: Justin Burkett
Subject: [elpa] scratch/add-vdiff 477eb88 161/258: Fix refinement bug
Date: Wed, 17 May 2017 08:13:43 -0400 (EDT)

branch: scratch/add-vdiff
commit 477eb881c0250c1f4000de39c6abcdd5cee812b8
Author: justbur <address@hidden>
Commit: justbur <address@hidden>

    Fix refinement bug
---
 vdiff.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/vdiff.el b/vdiff.el
index 61fa41e..3d0bf62 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -595,16 +595,16 @@ SYNTAX-CODE."
   (interactive (list vdiff-default-refinement-syntax-code
                      (vdiff--overlay-at-pos)))
   (let* ((ovr (or ovr (vdiff--overlay-at-pos)))
-         (target-ovrs (vdiff--target-overlays ovr))
+         (target-ovr (car (vdiff--target-overlays ovr)))
          (word-syn (or syntax-code
                        vdiff-default-refinement-syntax-code))
          (not-word-syn (concat "^" word-syn))
          instructions ovr-ins)
     (when (and ovr
-               target-ovrs
+               target-ovr
                (consp (setq instructions
-                            (vdiff--diff-words ovr target-ovrs))))
-      (dolist (curr-ovr (vdiff--all-overlays))
+                            (vdiff--diff-words ovr target-ovr))))
+      (dolist (curr-ovr (vdiff--all-overlays ovr))
         (setq ovr-ins (if (eq curr-ovr ovr)
                           (car instructions)
                         (cdr instructions)))
@@ -651,7 +651,7 @@ SYNTAX-CODE."
 
 (defun vdiff-remove-refinements-in-hunk (ovr)
   (interactive (list (vdiff--overlay-at-pos)))
-  (dolist (chg-ovr (vdiff--all-overlays))
+  (dolist (chg-ovr (vdiff--all-overlays ovr))
     (with-current-buffer (overlay-buffer chg-ovr)
       (dolist (sub-ovr (overlays-in
                         (overlay-start chg-ovr)



reply via email to

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