[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff bd80900 126/258: Merge pull request #7 from syo
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff bd80900 126/258: Merge pull request #7 from syohex/fix-package |
Date: |
Wed, 17 May 2017 08:13:36 -0400 (EDT) |
branch: scratch/add-vdiff
commit bd80900ea15dfa79d61d3deb0698057203da6d51
Merge: 750a1bc c8cba47
Author: Justin Burkett <address@hidden>
Commit: GitHub <address@hidden>
Merge pull request #7 from syohex/fix-package
Fix package
---
vdiff.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 93fa233..64d690a 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -6,7 +6,7 @@
;; URL: https://github.com/justbur/emacs-vdiff
;; Version: 0
;; Keywords:
-;; Package-Requires: ((emacs "24.3"))
+;; Package-Requires: ((emacs "24.4"))
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -664,7 +664,7 @@ of a \"word\"."
(cond ((assoc a-range vdiff--folds)
;; Restore any overlays on same range
(let* ((a-fold (cadr (assoc a-range vdiff--folds)))
- (b-fold (caddr (assoc a-range vdiff--folds)))
+ (b-fold (cl-caddr (assoc a-range vdiff--folds)))
(a-beg (vdiff--pos-at-line-beginning
(car a-range) a-buffer))
(a-end (vdiff--pos-at-line-beginning
- [elpa] scratch/add-vdiff 85a4d4e 087/258: Fix point jumping after sending changes, (continued)
- [elpa] scratch/add-vdiff 85a4d4e 087/258: Fix point jumping after sending changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f041c58 102/258: Sync lines after sending changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 88ce867 088/258: Initial attempt at refine commands, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f3ca6cb 110/258: Tweak vscroll function, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 84380fb 113/258: Delete unused lexical vars, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 40351c6 079/258: Exit hydra on vdiff exit, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 4bb84e4 073/258: Add update command to hydra, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 81478be 117/258: Lock diff data for certain operations, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 20bd4b4 092/258: Change terminology, Justin Burkett, 2017/05/17
- [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 <=
- [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, 2017/05/17
- [elpa] scratch/add-vdiff cd9dad4 191/258: Fix refresh function call sequence, Justin Burkett, 2017/05/17