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

[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)



reply via email to

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