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

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

[elpa] scratch/add-vdiff cce8eb1 086/258: Don't close fold on point afte


From: Justin Burkett
Subject: [elpa] scratch/add-vdiff cce8eb1 086/258: Don't close fold on point after change
Date: Wed, 17 May 2017 08:13:28 -0400 (EDT)

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

    Don't close fold on point after change
---
 vdiff.el | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/vdiff.el b/vdiff.el
index 79aa689..f5d7f64 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -417,14 +417,13 @@ parsing the diff output and triggering the overlay 
updates."
                (let ((a-fold (vdiff--make-fold a-buffer a-range))
                      (b-fold (vdiff--make-fold b-buffer b-range)))
                  (dolist (fold (list a-fold b-fold))
-                   (if vdiff--all-folds-open
-                          (vdiff--set-open-fold-props fold)
-                     (vdiff--set-closed-fold-props fold)))
+                   (cond ((or (vdiff--point-in-fold-p fold)
+                              vdiff--all-folds-open)
+                          (vdiff--set-open-fold-props fold))
+                         (t
+                          (vdiff--set-closed-fold-props fold))))
                  (overlay-put a-fold 'vdiff-other-fold b-fold)
                  (overlay-put b-fold 'vdiff-other-fold a-fold)
-                 (when (or (vdiff--point-in-fold-p a-buffer a-fold)
-                           (vdiff--point-in-fold-p b-buffer b-fold))
-                   (vdiff-open-fold (point) (1+ (point))))
                  (push (list a-range a-fold b-fold) new-folds))))))
     (setq vdiff--folds new-folds)))
 



reply via email to

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