[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 30b85fe 164/258: Fix sending changes with diff3
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 30b85fe 164/258: Fix sending changes with diff3 |
Date: |
Wed, 17 May 2017 08:13:43 -0400 (EDT) |
branch: scratch/add-vdiff
commit 30b85feb704bba52cc770e6ad39c783021fd6e60
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Fix sending changes with diff3
---
vdiff.el | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index f5d3ce2..11ff83e 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -258,8 +258,9 @@ because those are handled differently.")
(cons (buffer-name (overlay-buffer ovr))
(list ovr)))
other-ovrs)))
- (unless just-one
- (push (cons "all" other-ovrs) choices))
+ ;; FIXME: Doesn't quite send correctly
+ ;; (unless just-one
+ ;; (push (cons "all" other-ovrs) choices))
(cdr-safe
(assoc-string
(completing-read "Choose a target buffer(s): "
@@ -1049,8 +1050,7 @@ changes under point or on the immediately preceding line."
"Send text in OVR to corresponding overlay in other buffer."
(if (not (overlayp ovr))
(message "No change found")
- (let* ((addition (eq 'addition (overlay-get ovr 'vdiff-type)))
- (target-ovrs (or targets (vdiff--target-overlays ovr)))
+ (let* ((target-ovrs (or targets (vdiff--target-overlays ovr)))
(text (buffer-substring-no-properties
(overlay-start ovr)
(overlay-end ovr))))
@@ -1058,7 +1058,9 @@ changes under point or on the immediately preceding line."
(with-current-buffer (overlay-buffer target)
(save-excursion
(goto-char (overlay-start target))
- (unless addition
+ ;; subtractions are one char too big on purpose
+ (unless (eq (overlay-get target 'vdiff-type)
+ 'subtraction)
(delete-region (overlay-start target)
(overlay-end target)))
(insert text))
- [elpa] scratch/add-vdiff 81478be 117/258: Lock diff data for certain operations, (continued)
- [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, 2017/05/17
- [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 <=
- [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
- [elpa] scratch/add-vdiff f5fdcaa 241/258: vdiff-magit: Simplify exit from stage, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e8d3d26 236/258: vdiff-magit: Try to switch resolve functions gracefully, Justin Burkett, 2017/05/17