[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 3207365 064/258: Satisfy compiler
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 3207365 064/258: Satisfy compiler |
Date: |
Wed, 17 May 2017 08:13:24 -0400 (EDT) |
branch: scratch/add-vdiff
commit 32073651594cab0199a95d0d49ee8f8fd3847d38
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Satisfy compiler
---
vdiff.el | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 336a664..562c7b6 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -93,6 +93,7 @@
;;; Code:
(require 'cl-lib)
+(require 'subr-x)
(defgroup vdiff nil
"Diff tool that is like vimdiff"
@@ -457,7 +458,7 @@ text on the first line, and the width of the buffer."
(defun vdiff--remove-fold-overlays (_)
(setq vdiff--folds nil))
-(defun vdiff--add-diff-overlay (in-a code this-beg this-len other-beg
other-len)
+(defun vdiff--add-diff-overlay (in-a code this-len other-len)
(cond ((or (and in-a (string= code "d"))
(and (not in-a) (string= code "a")))
(vdiff--add-change-overlay this-len t))
@@ -515,15 +516,12 @@ text on the first line, and the width of the buffer."
(with-current-buffer a-buffer
(forward-line (- a-beg a-line))
(setq a-line a-beg)
- (setq ovr-a
- (vdiff--add-diff-overlay t code a-beg a-len b-beg
b-len)))
-
+ (setq ovr-a (vdiff--add-diff-overlay t code a-len b-len)))
(with-current-buffer b-buffer
(forward-line (- b-beg b-line))
(setq b-line b-beg)
(setq ovr-b
- (vdiff--add-diff-overlay nil code b-beg b-len a-beg
a-len)))
-
+ (vdiff--add-diff-overlay nil code b-len a-len)))
(overlay-put ovr-a 'vdiff-other-overlay ovr-b)
(overlay-put ovr-b 'vdiff-other-overlay ovr-a))))
(push (cons (cons a-last-post
- [elpa] scratch/add-vdiff ce10994 003/258: Introduce defcustoms and use lists instead of .., (continued)
- [elpa] scratch/add-vdiff ce10994 003/258: Introduce defcustoms and use lists instead of .., Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff ad6035d 015/258: Implement folding of unchanged lines, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff af75c6d 036/258: Add vdiff-exit, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e8834fa 035/258: Fix fold size calcs, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 9547850 041/258: Use diff faces from theme, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff bac92b3 037/258: Improve line translation and command mirroring, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 6b6f6e7 044/258: Force fold refresh on window size change, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e005d43 058/258: Delete overlays right away on sending changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1cf0730 055/258: Fix compiler warnings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 697bb79 060/258: Prefer last element of multiple in line map, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3207365 064/258: Satisfy compiler,
Justin Burkett <=
- [elpa] scratch/add-vdiff 8b6cb54 218/258: vdiff-magit: Port resolve, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 617265b 238/258: vdiff-magit: Remove unused magit-ediff code, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 6f89757 231/258: vdiff-magit: Resurrect resolve, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 0f8dd15 239/258: vdiff: Improve a couple of docstrings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d8cfb8f 243/258: vdiff: Don't use scroll-lock-mode programmatically, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff bc5a9a8 242/258: vdiff-magit: Remove unnecessary local bindings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c32fe46 251/258: vdiff: Fix compiler warnings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 875b0d5 252/258: README: Improve vdiff-magit-popup, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 8a3dff3 254/258: vdiff-magit: Add vdiff-magit-stage-is-2way, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3a32c4e 255/258: README: Update, Justin Burkett, 2017/05/17