[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 3037be6 222/258: vdiff-magit: Cleanup reference
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 3037be6 222/258: vdiff-magit: Cleanup references in dwim |
Date: |
Wed, 17 May 2017 08:13:57 -0400 (EDT) |
branch: scratch/add-vdiff
commit 3037be60d322a71183aa2c8007a70f8e1147374c
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>
vdiff-magit: Cleanup references in dwim
---
vdiff-magit.el | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/vdiff-magit.el b/vdiff-magit.el
index 06026b7..9c66a2e 100644
--- a/vdiff-magit.el
+++ b/vdiff-magit.el
@@ -310,10 +310,10 @@ mind at all, then it asks the user for a command to run."
(`unstaged (setq command #'vdiff-magit-show-unstaged))
(`staged (setq command #'vdiff-magit-show-staged))
(`(commit . ,value)
- (setq command #'magit-ediff-show-commit
+ (setq command #'vdiff-magit-show-commit
revB value))
(`(stash . ,value)
- (setq command #'magit-ediff-show-stash
+ (setq command #'vdiff-magit-show-stash
revB value))
((pred stringp)
(-let [(a b) (magit-ediff-compare--read-revisions range)]
@@ -336,17 +336,17 @@ mind at all, then it asks the user for a command to run."
(call-interactively
(magit-read-char-case
"Failed to read your mind; do you want to " t
- (?c "[c]ommit" 'magit-ediff-show-commit)
+ (?c "[c]ommit" 'vdiff-magit-show-commit)
(?r "[r]ange" 'vdiff-magit-compare)
(?s "[s]tage" 'vdiff-magit-stage)
(?v "resol[v]e" 'vdiff-magit-resolve))))
((eq command 'vdiff-magit-compare)
(apply 'vdiff-magit-compare revA revB
(magit-ediff-read-files revA revB file)))
- ((eq command 'magit-ediff-show-commit)
+ ((eq command 'vdiff-magit-show-commit)
(magit-ediff-show-commit revB))
- ((eq command 'magit-ediff-show-stash)
- (magit-ediff-show-stash revB))
+ ((eq command 'vdiff-magit-show-stash)
+ (vdiff-magit-show-stash revB))
(file
(funcall command file))
(t
- [elpa] scratch/add-vdiff 059d288 208/258: Update gitignore, (continued)
- [elpa] scratch/add-vdiff 059d288 208/258: Update gitignore, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff cfad650 207/258: Provide missing function for emacs-nox users, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e567468 221/258: vdiff-magit: Port show-working-tree, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 30b0f9c 213/258: Add vdiff-magit.el with two functions, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 64430c3 215/258: Cleanup merge, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 19f4616 217/258: vdiff-magit: Port compare and show-commit, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a81d62a 240/258: README: Update recent changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 9be4fe3 066/258: Update install instructions in README, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff eda4b1b 204/258: Force update of window-start in manual calls to scroll func, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7d60015 201/258: Add some doctrings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3037be6 222/258: vdiff-magit: Cleanup references in dwim,
Justin Burkett <=
- [elpa] scratch/add-vdiff 615e7bd 228/258: vdiff-magit: Fix killing of buffers in stage, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a040a4b 246/258: vdiff: Add vdiff-merge-conflict, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7fbb20e 205/258: Nil temp-session after using it, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 048d544 198/258: Pass session explicitly from refresh sentinel, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff ed25084 224/258: vdiff-magit: Fix some strings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 432534d 230/258: vdiff-magit: Don't use vdiff-magit-resolve yet, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1d79425 235/258: vdiff-magit: Cleanup header, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c2c991d 209/258: Add initial vdiff-magit work, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff fb3097c 247/258: vdiff: Check if window exists before forcing vscroll, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff bcacd3f 249/258: vdiff: Add option vdiff-use-ancestor-as-merge-buffer, Justin Burkett, 2017/05/17