emacs-elpa-diffs
[Top][All Lists]
Advanced

[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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]