[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)))
- [elpa] scratch/add-vdiff 0fd1837 063/258: Update screenshot, (continued)
- [elpa] scratch/add-vdiff 0fd1837 063/258: Update screenshot, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff b02b59e 072/258: Whitespace cleanup, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff b2ba7ab 070/258: Move hydra to main file and avoid dependency, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff bfdfc74 053/258: Modify gitignore, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d25fe21 054/258: More arg name changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 875e6ce 057/258: Merge pull request #2 from purcell/patch-1, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1640078 061/258: Merge remote-tracking branch 'origin/master', Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c6c959d 071/258: Fix nth-change at beginning and end of buffer, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d07e9fb 056/258: Fix typo in package description, remove redundant "for Emacs", Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 69c85cb 080/258: Better way to trigger other window update, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff cce8eb1 086/258: Don't close fold on point after change,
Justin Burkett <=
- [elpa] scratch/add-vdiff 8a88f84 074/258: Use simpler strategy for updating windows on line move, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c5589a1 089/258: Delete temp files on deactivation, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 4dc6c89 077/258: Add next/prev fold commands and update hydra, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 4ea6afb 082/258: Add docstrings and rearrange some calls, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 52c675a 096/258: Add hydra screenshot, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1276208 103/258: Recenter after next/prev hunk, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 4ee7fca 104/258: Set intangible property for closed folds, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 16eb802 107/258: Update README, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 0dc9fde 114/258: Try not to move point on change transmission, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff cc24574 115/258: Fix scroll update for other subtraction styles, Justin Burkett, 2017/05/17