[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 0cbaf6f 156/258: Fix point jumping after receiv
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 0cbaf6f 156/258: Fix point jumping after receive-changes |
Date: |
Wed, 17 May 2017 08:13:42 -0400 (EDT) |
branch: scratch/add-vdiff
commit 0cbaf6fd9223141f076253c49c8bfc235e177485
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Fix point jumping after receive-changes
---
vdiff.el | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index a19d859..29c604d 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1004,7 +1004,7 @@ well. This only returns bounds for `interactive'."
(forward-line 1)
(point)))))
-(defun vdiff-send-changes (beg end &optional receive targets)
+(defun vdiff-send-changes (beg end &optional receive targets dont-refresh)
"Send changes in this hunk to other vdiff buffer. If the region
is active, send all changes found in the region. Otherwise use
the hunk under point or on the immediately preceding line."
@@ -1017,14 +1017,15 @@ the hunk under point or on the immediately preceding
line."
(or targets (vdiff--target-overlays ovr t))))
(let ((pos (overlay-start (car target-ovrs))))
(with-current-buffer (overlay-buffer (car target-ovrs))
- (vdiff-send-changes pos (1+ pos)))))
+ (vdiff-send-changes pos (1+ pos) nil nil t))))
((memq (overlay-get ovr 'vdiff-type)
'(change addition))
(vdiff--transmit-change ovr targets))
((eq (overlay-get ovr 'vdiff-type) 'subtraction)
(vdiff--transmit-subtraction ovr targets))))
- (vdiff-refresh)
- (vdiff--scroll-function)))
+ (unless dont-refresh
+ (vdiff-refresh)
+ (vdiff--scroll-function))))
(defun vdiff-receive-changes (beg end)
"Receive the changes corresponding to this position from the
- [elpa] scratch/add-vdiff 96258b1 046/258: Don't set open fold face, (continued)
- [elpa] scratch/add-vdiff 96258b1 046/258: Don't set open fold face, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff dc7a5e2 049/258: Add a comment on line-map structure, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e9d0cc7 050/258: Define new bitmaps for open and close of folds, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1c8dd1e 138/258: Default to nil for auto refinement, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3d0678f 142/258: Make bitmaps nicer, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 53ee239 149/258: Fix bug in receive changes for 3way, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e171b7c 140/258: Depend on hydra, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff baed24a 148/258: Work on moving refresh to 3way, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 74ebab6 143/258: Don't move point when closing all folds, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 938cc55 155/258: Fix use of delq (wanted remq), Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 0cbaf6f 156/258: Fix point jumping after receive-changes,
Justin Burkett <=
- [elpa] scratch/add-vdiff 8f7a212 157/258: Remove with-other-window and sync-line, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c2627f0 160/258: Fix recenter-all, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 78071df 147/258: Use a separate minor-mode for 3way, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a373c6b 139/258: Fix line endings in README, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7bc7f40 172/258: Add recent changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 8842469 184/258: Allow point to leave overlay on target selection, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff b4c3e09 195/258: Ensure sentinel runs in correct context, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 28c939f 194/258: Document new option, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 133e187 193/258: Allow folds to close on point but make optional, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 4dd194b 190/258: Update screenshot with refinements, Justin Burkett, 2017/05/17