[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 8b6cb54 218/258: vdiff-magit: Port resolve
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 8b6cb54 218/258: vdiff-magit: Port resolve |
Date: |
Wed, 17 May 2017 08:13:55 -0400 (EDT) |
branch: scratch/add-vdiff
commit 8b6cb548607ed93b2f6432a53e4534fa33732395
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>
vdiff-magit: Port resolve
---
vdiff-magit.el | 33 ++++++++++++++-------------------
1 file changed, 14 insertions(+), 19 deletions(-)
diff --git a/vdiff-magit.el b/vdiff-magit.el
index aac4e88..4bcc942 100644
--- a/vdiff-magit.el
+++ b/vdiff-magit.el
@@ -105,7 +105,7 @@
;; ;; (?u "Show unstaged" vdiff-magit-show-unstaged)
;; (?s "Stage (vdiff)" vdiff-magit-stage)
;; ;; (?i "Show staged" magit-ediff-show-staged)
-;; ;; (?m "Resolve" magit-ediff-resolve)
+;; ;; (?m "Resolve" vdiff-magit-resolve)
;; ;; (?w "Show worktree" magit-ediff-show-working-tree)
;; ;; (?r "Diff range" vdiff-magit-compare)
;; ;; (?c "Show commit" magit-ediff-show-commit) nil
@@ -190,26 +190,21 @@ conflicts, including those already resolved by Git, use
(funcall mode)))
;; the rest of the code is inspired from vc.el
- ;; Fire up ediff.
+ ;; Fire up vdiff.
(vdiff-buffers3
mine other base
`(lambda (mine other base)
- (let ((orig-buf ,buf))
- (with-current-buffer orig-buf
- (when (yes-or-no-p (format "Conflict resolution finished; save
%s?"
- buffer-file-name))
- (erase-buffer)
- (insert-buffer-substring base)
- (save-buffer))))
- (when (buffer-live-p mine) (kill-buffer mine))
- (when (buffer-live-p other) (kill-buffer other))
- (when (buffer-live-p base) (kill-buffer base))
- ;; (when (buffer-live-p ediff-ancestor-buffer)
- ;; (kill-buffer ediff-ancestor-buffer))
- (set-window-configuration ,config)
- ;; (let ((magit-ediff-previous-winconf smerge-ediff-windows))
- ;; (run-hooks 'magit-ediff-quit-hook))
- ))))))
+ (let ((orig-buf ,buf))
+ (with-current-buffer orig-buf
+ (when (yes-or-no-p (format "Conflict resolution finished; save
%s?"
+ buffer-file-name))
+ (erase-buffer)
+ (insert-buffer-substring base)
+ (save-buffer))))
+ (when (buffer-live-p mine) (kill-buffer mine))
+ (when (buffer-live-p other) (kill-buffer other))
+ (when (buffer-live-p base) (kill-buffer base))
+ (set-window-configuration ,config)))))))
;;;###autoload
(defun vdiff-magit-stage (file)
@@ -310,7 +305,7 @@ mind at all, then it asks the user for a command to run."
((and (guard (not magit-ediff-dwim-show-on-hunks))
(or `unstaged `staged))
(setq command (if (magit-anything-unmerged-p)
- #'magit-ediff-resolve
+ #'vdiff-magit-resolve
#'vdiff-magit-stage)))
(`unstaged (setq command #'vdiff-magit-show-unstaged))
(`staged (setq command #'vdiff-magit-show-staged))
- [elpa] scratch/add-vdiff ad6035d 015/258: Implement folding of unchanged lines, (continued)
- [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, 2017/05/17
- [elpa] scratch/add-vdiff 8b6cb54 218/258: vdiff-magit: Port resolve,
Justin Burkett <=
- [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
- [elpa] scratch/add-vdiff d4883de 256/258: vdiff-magit: Remove use of camel case names for consistency, Justin Burkett, 2017/05/17