[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 582d13d 180/258: Fix compiler warnings
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 582d13d 180/258: Fix compiler warnings |
Date: |
Wed, 17 May 2017 08:13:46 -0400 (EDT) |
branch: scratch/add-vdiff
commit 582d13d00761adf15c3c40149ef379d9db4010dd
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Fix compiler warnings
---
vdiff.el | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 7d56cef..b01076a 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -54,6 +54,9 @@
(require 'diff-mode)
(require 'hydra)
+(defvar vdiff-mode)
+(defvar vdiff-3way-mode)
+
(defgroup vdiff nil
"Diff tool that is like vimdiff"
:tag "Vdiff"
@@ -192,7 +195,7 @@ because those are handled differently.")
(defvar vdiff--after-change-timer nil)
(defvar vdiff--after-change-refresh-delay 1)
(defvar vdiff--new-command nil)
-;; (defvar vdiff--last-command nil)
+(defvar vdiff--last-command nil)
(defvar vdiff--case-options
'(("Don't ignore case" . "")
("Ignore case (-i)" . "-i")))
@@ -613,7 +616,8 @@ parsing the diff output and triggering the overlay updates."
(tmp-file-a (make-temp-file "vdiff-word-a-"))
(tmp-file-b (make-temp-file "vdiff-word-b-"))
(out-buffer (get-buffer-create
- vdiff--word-diff-output-buffer))
+ (vdiff-session-word-diff-output-buffer
+ vdiff--session)))
(a-result '())
(b-result '()))
(write-region a-words nil tmp-file-a nil 'quietly)
- [elpa] scratch/add-vdiff 3d8e224 127/258: Simplify insertion arrow code, (continued)
- [elpa] scratch/add-vdiff 3d8e224 127/258: Simplify insertion arrow code, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff bd80900 126/258: Merge pull request #7 from syohex/fix-package, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1102da8 129/258: Avoid subtraction overlays larger than window-height, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7135738 132/258: Version 0.1, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 2e7f076 141/258: Simplify bitmap creation, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 001ae43 152/258: Fix modification of buffer list, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 477eb88 161/258: Fix refinement bug, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f1eca80 165/258: Disable refine-all-hunks for diff3, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 30b85fe 164/258: Fix sending changes with diff3, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 816fe2a 182/258: Fix subtraction string width, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 582d13d 180/258: Fix compiler warnings,
Justin Burkett <=
- [elpa] scratch/add-vdiff cd9dad4 191/258: Fix refresh function call sequence, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 2847cd6 183/258: Add callback support on quit, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 90f81f0 175/258: Make sure hook functions execute in vdiff bufs, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 2d48cb5 229/258: vdiff-magit: Simplify resolve, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c31755a 220/258: vdiff-magit: Port show stash, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff cfb90d7 233/258: vdiff-magit: Add note to README, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f5fdcaa 241/258: vdiff-magit: Simplify exit from stage, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e8d3d26 236/258: vdiff-magit: Try to switch resolve functions gracefully, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7c87360 244/258: vdiff: Add vdiff-current-file, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 8b32329 245/258: vdiff: Filter out killed buffers better, Justin Burkett, 2017/05/17