[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 617265b 238/258: vdiff-magit: Remove unused mag
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 617265b 238/258: vdiff-magit: Remove unused magit-ediff code |
Date: |
Wed, 17 May 2017 08:14:00 -0400 (EDT) |
branch: scratch/add-vdiff
commit 617265b113f99117056893102b05b0b375b4ef9a
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>
vdiff-magit: Remove unused magit-ediff code
---
vdiff-magit.el | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/vdiff-magit.el b/vdiff-magit.el
index fa456f0..5f7e430 100644
--- a/vdiff-magit.el
+++ b/vdiff-magit.el
@@ -31,23 +31,6 @@
"vdiff support for Magit."
:group 'magit-extensions)
-;; (unless (find-lisp-object-file-name 'magit-ediff-quit-hook 'defvar)
-;; (add-hook 'magit-ediff-quit-hook 'magit-ediff-restore-previous-winconf)
-;; (add-hook 'magit-ediff-quit-hook 'magit-ediff-cleanup-auxiliary-buffers))
-;; (defcustom magit-ediff-quit-hook
-;; '(magit-ediff-cleanup-auxiliary-buffers
-;; magit-ediff-restore-previous-winconf)
-;; "Hooks to run after finishing Ediff, when that was invoked using Magit.
-;; The hooks are run in the Ediff control buffer. This is similar
-;; to `ediff-quit-hook' but takes the needs of Magit into account.
-;; The `ediff-quit-hook' is ignored by Ediff sessions which were
-;; invoked using Magit."
-;; :package-version '(magit . "2.2.0")
-;; :group 'magit-ediff
-;; :type 'hook
-;; :options '(magit-ediff-cleanup-auxiliary-buffers
-;; magit-ediff-restore-previous-winconf))
-
(defcustom vdiff-magit-dwim-show-on-hunks nil
"Whether `vdiff-magit-dwim' runs show variants on hunks.
If non-nil, `vdiff-magit-show-staged' or
@@ -459,16 +442,5 @@ stash that were staged."
nil t t))
(vdiff-magit-compare revA revC fileA fileC))))
-;; Don't think this is necessary
-;; (defun magit-vdiff-cleanup-auxiliary-buffers ()
-;; (ediff-kill-buffer-carefully ediff-diff-buffer)
-;; (ediff-kill-buffer-carefully ediff-custom-diff-buffer)
-;; (ediff-kill-buffer-carefully ediff-fine-diff-buffer)
-;; (ediff-kill-buffer-carefully ediff-tmp-buffer)
-;; (ediff-kill-buffer-carefully ediff-error-buffer)
-;; (ediff-kill-buffer-carefully ediff-msg-buffer)
-;; (ediff-kill-buffer-carefully ediff-debug-buffer))
-
-
(provide 'vdiff-magit)
;;; vdiff-magit.el ends here
- [elpa] scratch/add-vdiff af75c6d 036/258: Add vdiff-exit, (continued)
- [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, 2017/05/17
- [elpa] scratch/add-vdiff 617265b 238/258: vdiff-magit: Remove unused magit-ediff code,
Justin Burkett <=
- [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
- [elpa] scratch/add-vdiff 819ea4b 258/258: Add 'packages/vdiff/' from commit 'f11c7c2eeef33a0b75fe4e025818e7e672c57397', Justin Burkett, 2017/05/17