From 8228c37d3e319d50de92270c4574142eee83da5d Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sun, 20 Mar 2016 22:26:37 -0400
Subject: Move magit-popup configuration to its own section

---
 init.el | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index 770c872..8d20af2 100644
--- a/init.el
+++ b/init.el
@@ -809,6 +809,18 @@
   :load-path "~/src/emacs/with-editor/"
   :defer t)
 
+(use-package magit-popup
+  :load-path "~/src/emacs/magit/lisp/"
+  :defer t
+  :config
+  (setq magit-popup-show-help-echo nil
+        magit-popup-show-common-commands nil
+        magit-popup-use-prefix-argument 'default)
+
+  (bind-keys :map magit-popup-mode-map
+             ("SPC <t>" . magit-invoke-popup-switch)
+             ("SPC SPC <t>" . magit-invoke-popup-option)))
+
 (use-package magit
   :load-path "~/src/emacs/magit/lisp/"
   :defer t
@@ -835,9 +847,6 @@
         magit-buffer-name-format "*%M%v: %t*")
   (setq magit-no-confirm '(stage-all-changes unstage-all-changes reverse))
 
-  (setq magit-popup-show-help-echo nil
-        magit-popup-show-common-commands nil
-        magit-popup-use-prefix-argument 'default)
   (setq magit-branch-arguments
         (delete "--track" magit-branch-arguments))
   (setq magit-patch-popup
@@ -873,11 +882,6 @@
   (bind-keys :map km/magit-map
              ("l" . magit-toggle-buffer-lock))
 
-  (define-key magit-popup-mode-map (kbd "SPC <t>")
-    #'magit-invoke-popup-switch)
-  (define-key magit-popup-mode-map (kbd "SPC SPC <t>")
-    #'magit-invoke-popup-option)
-
   (magit-define-popup-action 'magit-diff-popup
     ?e "Edit options" #'magit-diff-refresh-popup)
 
-- 
cgit v1.2.3