[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 53ee239 149/258: Fix bug in receive changes for
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 53ee239 149/258: Fix bug in receive changes for 3way |
Date: |
Wed, 17 May 2017 08:13:41 -0400 (EDT) |
branch: scratch/add-vdiff
commit 53ee239d06255b9122b8d1ce484b05db6a5ad1d8
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Fix bug in receive changes for 3way
---
vdiff.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 39adfe4..6327cd3 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1009,9 +1009,9 @@ the hunk under point or on the immediately preceding
line."
(let* ((vdiff--inhibit-diff-update t)
target-ovrs)
(dolist (ovr (overlays-in beg end))
- (cond ((and (setq target-ovrs
- (or targets (vdiff--target-overlays ovr t)))
- receive)
+ (cond ((and receive
+ (setq target-ovrs
+ (or targets (vdiff--target-overlays ovr t))))
;; Assume that
(let ((pos (overlay-start (car target-ovrs))))
(vdiff--with-other-window
- [elpa] scratch/add-vdiff d77dd83 032/258: Take care to only remove vdiff overlays on refresh, (continued)
- [elpa] scratch/add-vdiff d77dd83 032/258: Take care to only remove vdiff overlays on refresh, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f915562 047/258: Use customizable function to format closed fold strings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d8a4efb 023/258: Remove unused variable, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 23b3360 030/258: Fix compiler warnings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff eeede0b 045/258: Reset open-fold-face, Justin Burkett, 2017/05/17
- [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 <=
- [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, 2017/05/17
- [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