[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 87ade86 192/258: Always move to start of fold o
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 87ade86 192/258: Always move to start of fold on close |
Date: |
Wed, 17 May 2017 08:13:49 -0400 (EDT) |
branch: scratch/add-vdiff
commit 87ade86ae0c4748a59d037040904be00c9ad3bae
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Always move to start of fold on close
---
vdiff.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/vdiff.el b/vdiff.el
index 97ae844..910532e 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1414,6 +1414,8 @@ buffer)."
(defun vdiff--set-closed-fold-props (ovr)
"Set overlay properties to close fold OVR."
+ (when (vdiff--point-in-fold-p ovr)
+ (goto-char (overlay-start ovr)))
(overlay-put ovr 'vdiff-fold-open nil)
(overlay-put ovr 'before-string nil)
(overlay-put ovr 'line-prefix nil)
@@ -1442,7 +1444,6 @@ folds in the region."
(dolist (ovr (overlays-in beg end))
(when (eq (overlay-get ovr 'vdiff-type) 'fold)
(setf (vdiff-session-all-folds-open vdiff--session) nil)
- (goto-char (overlay-start ovr))
(vdiff--set-closed-fold-props ovr)
(dolist (other-fold (overlay-get ovr 'vdiff-other-folds))
(vdiff--set-closed-fold-props other-fold)))))
- [elpa] scratch/add-vdiff 5dcdc97 158/258: Remove other-window, (continued)
- [elpa] scratch/add-vdiff 5dcdc97 158/258: Remove other-window, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7029054 159/258: Comment out vdiff-buffers3, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 97d7098 174/258: Add screenshot of three way diff, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 8b79246 171/258: Make sure we're in a vdiff buffer on refresh, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 42f56ae 177/258: Don't jump to beginning of buffer on start, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 192dbfe 166/258: Release vdiff-buffers3, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1d8f6e7 185/258: Use correct mode for three way diff on quit, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 71d1d20 169/258: Add overlay markers to diff3 send/receive, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff fef3208 189/258: Update screenshot, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 03e1b64 186/258: Remove unnecessary unique name function, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 87ade86 192/258: Always move to start of fold on close,
Justin Burkett <=
- [elpa] scratch/add-vdiff d3faef0 197/258: Refresh manually after receive, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a88d313 200/258: Sync scroll after fold toggle, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 74feddf 206/258: Adjust width of subtraction string, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 9d89a66 211/258: Add melpa badge, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff b705857 006/258: Remove window-starts variable, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff aadf726 011/258: Add TODO item, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 23a8f14 013/258: One more TODO, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3ef30aa 020/258: Update screenshot, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff dec9dc5 026/258: Small README change, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 2c113c4 029/258: Merge pull request #1 from syohex/cl-lib, Justin Burkett, 2017/05/17