[elpa] scratch/add-vdiff 90374e7 223/258: vdiff-magit: Port dwim-show-on-hunks

[Justin Burkett]

branch: scratch/add-vdiff
commit 90374e72a6fc4bd4abdec5d19e170b28c6d3cab3
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>

    vdiff-magit: Port dwim-show-on-hunks
---
 vdiff-magit.el | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/vdiff-magit.el b/vdiff-magit.el
index 9c66a2e..9f20ccb 100644
--- a/vdiff-magit.el
+++ b/vdiff-magit.el
@@ -52,15 +52,15 @@
 ;;   :options '(magit-ediff-cleanup-auxiliary-buffers
 ;;              magit-ediff-restore-previous-winconf))
 
-;; (defcustom magit-ediff-dwim-show-on-hunks nil
-;;   "Whether `magit-ediff-dwim' runs show variants on hunks.
-;; If non-nil, `magit-ediff-show-staged' or
-;; `vdiff-magit-show-unstaged' are called based on what section the
-;; hunk is in.  Otherwise, `magit-ediff-dwim' runs
-;; `magit-ediff-stage' when point is on an uncommitted hunk."
-;;   :package-version '(magit . "2.2.0")
-;;   :group 'magit-ediff
-;;   :type 'boolean)
+(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
+`vdiff-magit-show-unstaged' are called based on what section the
+hunk is in.  Otherwise, `vdiff-magit-dwim' runs
+`vdiff-magit-stage' when point is on an uncommitted hunk."
+  ;; :package-version '(magit . "2.2.0")
+  :group 'vdiff-magit
+  :type 'boolean)
 
 (defcustom vdiff-magit-show-stash-with-index t
   "Whether `vdiff-magit-show-stash' shows the state of the index.
@@ -90,7 +90,7 @@ address@hidden@{N}.  Along with any unstaged changes, changes
 in the index commit, address@hidden, will be shown in this
 comparison unless they conflicted with changes in the working
 tree at the time of stashing."
-  :package-version '(magit . "2.6.0")
+  ;; :package-version '(magit . "2.6.0")
   :group 'vdiff-magit
   :type 'boolean)
 
@@ -302,7 +302,7 @@ mind at all, then it asks the user for a command to run."
            (file (magit-current-file))
            command revA revB)
        (pcase range
-         ((and (guard (not magit-ediff-dwim-show-on-hunks))
+         ((and (guard (not vdiff-magit-dwim-show-on-hunks))
                (or `unstaged `staged))
           (setq command (if (magit-anything-unmerged-p)
                             #'vdiff-magit-resolve
@@ -326,7 +326,7 @@ mind at all, then it asks the user for a command to run."
               (`committed (-let [(a b) (magit-ediff-compare--read-revisions
                                         (car magit-refresh-args))]
                             (setq revA a revB b)))
-              ((guard (not magit-ediff-dwim-show-on-hunks))
+              ((guard (not vdiff-magit-dwim-show-on-hunks))
                (setq command #'vdiff-magit-stage))
               (`unstaged  (setq command #'vdiff-magit-show-unstaged))
               (`staged    (setq command #'vdiff-magit-show-staged))