Reenable magit-gitflow

syl20bnr · Feb 18, 2019 · f6a42ef · f6a42ef
1 parent 79279f4
commit f6a42ef
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/layers/+source-control/git/packages.el b/layers/+source-control/git/packages.el
@@ -24,9 +24,7 @@
         (helm-git-grep :requires helm)
         (helm-gitignore :requires helm)
         magit
-        ;; Latest magit version with new transient keys
-        ;; working on a fix.
-        ;; magit-gitflow
+        magit-gitflow
         magit-svn
         (orgit :requires org)
         smeargle
@@ -218,12 +216,12 @@ Press [_b_] again to blame further in the history, [_q_] to go up or quit."
 
 (defun git/init-magit-gitflow ()
   (use-package magit-gitflow
-    :commands turn-on-magit-gitflow
-    :init (progn
-            (add-hook 'magit-mode-hook 'turn-on-magit-gitflow)
-            (with-eval-after-load 'magit
-              (define-key magit-mode-map "%" 'magit-gitflow-popup)))
-    :config (spacemacs|diminish magit-gitflow-mode "Flow")))
+    :defer t
+    :init (add-hook 'magit-mode-hook 'turn-on-magit-gitflow)
+    :config
+    (progn
+      (spacemacs|diminish magit-gitflow-mode "Flow")
+      (define-key magit-mode-map "%" 'magit-gitflow-popup))))
 
 (defun git/init-magit-svn ()
   (use-package magit-svn