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

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

[elpa] scratch/add-vdiff 016518f 016/258: Fix folds at end of buffer


From: Justin Burkett
Subject: [elpa] scratch/add-vdiff 016518f 016/258: Fix folds at end of buffer
Date: Wed, 17 May 2017 08:13:13 -0400 (EDT)

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

    Fix folds at end of buffer
---
 vdiff.el | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/vdiff.el b/vdiff.el
index 916c9fc..c358d2c 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -375,12 +375,12 @@ lines hidden."
   (vdiff--remove-all-overlays)
   (vdiff--refresh-line-maps)
   (save-excursion
-    (let ((a-last-post-end 1)
+    (let ((a-buffer (car vdiff--buffers))
+          (b-buffer (cadr vdiff--buffers))
+          (a-last-post-end 1)
           (b-last-post-end 1))
       (dolist (header vdiff--diff-data)
-        (let* ((a-buffer (car vdiff--buffers))
-               (b-buffer (cadr vdiff--buffers))
-               (code (nth 0 header))
+        (let* ((code (nth 0 header))
                (a-range (nth 1 header))
                (b-range (nth 2 header))
                (a-beg (car a-range))
@@ -433,7 +433,15 @@ lines hidden."
                  (vdiff--add-change-overlays
                   a-buffer a-beg a-length b-norm-range)
                  (vdiff--add-change-overlays
-                  b-buffer b-beg b-length a-norm-range))))))))
+                  b-buffer b-beg b-length a-norm-range)))))
+      (vdiff--add-folds
+       a-buffer b-buffer
+       (cons a-last-post-end
+             (with-current-buffer a-buffer
+               (line-number-at-pos (point-max))))
+       (cons b-last-post-end
+             (with-current-buffer b-buffer
+               (line-number-at-pos (point-max))))))))
 
 ;; * Moving changes
 



reply via email to

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