[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 53c2a6b 153/258: Fix receiving changes
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 53c2a6b 153/258: Fix receiving changes |
Date: |
Wed, 17 May 2017 08:13:41 -0400 (EDT) |
branch: scratch/add-vdiff
commit 53c2a6bbd6d531acbaa5e480bb6ba741e440aee6
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Fix receiving changes
---
vdiff.el | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 8f5d8e1..addb331 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1015,10 +1015,9 @@ the hunk under point or on the immediately preceding
line."
(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
- (vdiff-send-changes pos (1+ pos)))))
+ (with-current-buffer (overlay-buffer (car target-ovrs))
+ (vdiff-send-changes pos (1+ pos)))))
((memq (overlay-get ovr 'vdiff-type)
'(change addition))
(vdiff--transmit-change ovr targets))
- [elpa] scratch/add-vdiff 6516112 075/258: Minor formatting, (continued)
- [elpa] scratch/add-vdiff 6516112 075/258: Minor formatting, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 968047f 093/258: Change wording in a docstring, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff ad0e8c3 091/258: Make mirrored-commands private and rename, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 309e912 108/258: Refresh automatically on idle after change, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 5b1b342 119/258: Remove duplicated code in vdiff-files, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 750a1bc 124/258: Fix bug in remove-refinements, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c8cba47 125/258: Fix package, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 83f0788 118/258: Don't make temp files global, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 72fe0fa 130/258: Don't update diff info while sending changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c6e30a2 136/258: Merge pull request #9 from gvol/master, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 53c2a6b 153/258: Fix receiving changes,
Justin Burkett <=
- [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