[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff c6e30a2 136/258: Merge pull request #9 from gvo
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff c6e30a2 136/258: Merge pull request #9 from gvol/master |
Date: |
Wed, 17 May 2017 08:13:38 -0400 (EDT) |
branch: scratch/add-vdiff
commit c6e30a291b8b0f58f1406eff2137d77abf3a3dc5
Merge: 8daa391 25ec344
Author: Justin Burkett <address@hidden>
Commit: GitHub <address@hidden>
Merge pull request #9 from gvol/master
Require diff-mode so that diff-mode faces are available
---
vdiff.el | 1 +
1 file changed, 1 insertion(+)
diff --git a/vdiff.el b/vdiff.el
index 3e94a7f..dd96296 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -51,6 +51,7 @@
(require 'cl-lib)
(require 'subr-x)
+(require 'diff-mode)
(defgroup vdiff nil
"Diff tool that is like vimdiff"
- [elpa] scratch/add-vdiff 425d50b 085/258: Add vdiff-close-other-folds, (continued)
- [elpa] scratch/add-vdiff 425d50b 085/258: Add vdiff-close-other-folds, Justin Burkett, 2017/05/17
- [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 <=
- [elpa] scratch/add-vdiff 53c2a6b 153/258: Fix receiving changes, Justin Burkett, 2017/05/17
- [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