[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 71b6f40 43/57: Bound target lines in vdiff--transmit-chang
From: |
Justin Burkett |
Subject: |
[elpa] master 71b6f40 43/57: Bound target lines in vdiff--transmit-changes |
Date: |
Tue, 3 Nov 2020 14:32:25 -0500 (EST) |
branch: master
commit 71b6f40ade4abde88324149b161d40cdc6c53faa
Author: Justin Burkett <justin@burkett.cc>
Commit: Justin Burkett <justin@burkett.cc>
Bound target lines in vdiff--transmit-changes
---
vdiff.el | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 7e568f7..7a01aec 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1435,14 +1435,18 @@ immediately preceding line."
(dolist (target target-ovrs)
(with-current-buffer (overlay-buffer target)
(let* ((target-buffer (vdiff--buffer-p))
+ (min-line (line-number-at-pos (overlay-start ovr)))
(target-beg-line
(when beg-line
- (car (vdiff--translate-line
- beg-line from-buffer target-buffer))))
+ (max min-line
+ (car (vdiff--translate-line
+ beg-line from-buffer target-buffer)))))
+ (max-line (line-number-at-pos (overlay-end ovr)))
(target-end-line
(when end-line
- (car (vdiff--translate-line
- end-line from-buffer target-buffer)))))
+ (min max-line
+ (car (vdiff--translate-line
+ end-line from-buffer target-buffer))))))
(save-excursion
(if target-beg-line
(vdiff--move-to-line target-beg-line)
- [elpa] master 007e44b 56/57: Version 0.2.4, (continued)
- [elpa] master 007e44b 56/57: Version 0.2.4, Justin Burkett, 2020/11/03
- [elpa] master 69eacfe 18/57: Fix and simplify final newline detection, Justin Burkett, 2020/11/03
- [elpa] master 68d6ea3 23/57: Make name of vdiff-test consistent with prefixes, Justin Burkett, 2020/11/03
- [elpa] master e3f5370 37/57: Handle case where full line is not selected in selective send, Justin Burkett, 2020/11/03
- [elpa] master 6c3731a 40/57: Fixup vdiff--transmit-change for 3way diffs, Justin Burkett, 2020/11/03
- [elpa] master ef899b8 46/57: Reset truncate-lines on cleanup, Justin Burkett, 2020/11/03
- [elpa] master c5e0cb0 47/57: Update gitignore, Justin Burkett, 2020/11/03
- [elpa] master 5b643c7 24/57: Add another send/receive test, Justin Burkett, 2020/11/03
- [elpa] master 4cc1ee5 35/57: Allow sending selective regions from additions, Justin Burkett, 2020/11/03
- [elpa] master 02309fc 38/57: Retain buffer identities in line maps, Justin Burkett, 2020/11/03
- [elpa] master 71b6f40 43/57: Bound target lines in vdiff--transmit-changes,
Justin Burkett <=
- [elpa] master 0efde18 49/57: Improve behavior with respect to region selection, Justin Burkett, 2020/11/03
- [elpa] master 185e803 57/57: Merge commit '007e44be19d068fd6b49874b6e9b8df8b1f552bd', Justin Burkett, 2020/11/03
- [elpa] master 90f4b24 52/57: Ensure char-before doesn't cause an error, Justin Burkett, 2020/11/03
- [elpa] master a1a82de 50/57: Merge pull request #25 from justbur/send-region, Justin Burkett, 2020/11/03
- [elpa] master 08437d5 48/57: Update gitignore, Justin Burkett, 2020/11/03
- [elpa] master 09e15fc 51/57: Announce selective sending of changes using the region in README, Justin Burkett, 2020/11/03
- [elpa] master 45923bb 41/57: Fix compiler warnings, Justin Burkett, 2020/11/03
- [elpa] master 745cc02 42/57: Add test for selective send, Justin Burkett, 2020/11/03
- [elpa] master fe10fb3 44/57: Cleanup some of the transmit addition/changes logic, Justin Burkett, 2020/11/03
- [elpa] master 835485b 13/57: Announce vdiff-diff-algorithm in README, Justin Burkett, 2020/11/03