[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)
- [elpa] scratch/add-vdiff 40351c6 079/258: Exit hydra on vdiff exit, (continued)
- [elpa] scratch/add-vdiff 40351c6 079/258: Exit hydra on vdiff exit, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 4bb84e4 073/258: Add update command to hydra, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 81478be 117/258: Lock diff data for certain operations, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 20bd4b4 092/258: Change terminology, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3d8e224 127/258: Simplify insertion arrow code, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff bd80900 126/258: Merge pull request #7 from syohex/fix-package, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1102da8 129/258: Avoid subtraction overlays larger than window-height, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7135738 132/258: Version 0.1, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 2e7f076 141/258: Simplify bitmap creation, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 001ae43 152/258: Fix modification of buffer list, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 477eb88 161/258: Fix refinement bug,
Justin Burkett <=
- [elpa] scratch/add-vdiff f1eca80 165/258: Disable refine-all-hunks for diff3, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 30b85fe 164/258: Fix sending changes with diff3, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 816fe2a 182/258: Fix subtraction string width, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 582d13d 180/258: Fix compiler warnings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff cd9dad4 191/258: Fix refresh function call sequence, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 2847cd6 183/258: Add callback support on quit, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 90f81f0 175/258: Make sure hook functions execute in vdiff bufs, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 2d48cb5 229/258: vdiff-magit: Simplify resolve, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c31755a 220/258: vdiff-magit: Port show stash, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff cfb90d7 233/258: vdiff-magit: Add note to README, Justin Burkett, 2017/05/17