emacs-elpa-diffs
[Top][All Lists]
Advanced

[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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]