summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2016-02-14 12:48:35 -0500
committerKyle Meyer <kyle@kyleam.com>2016-02-14 12:48:35 -0500
commit1c4ec3808d1297bbda578f0812c23462e6c0a90d (patch)
tree489f0dd2f506fdf097b6cc56a604991643f31410
parentb3efd28f1b0328f1d1ce1004113fb3866d03408e (diff)
downloademacs.d-1c4ec3808d1297bbda578f0812c23462e6c0a90d.tar.gz
magit: Move magit-wip to its own section
-rw-r--r--init.el35
1 files changed, 20 insertions, 15 deletions
diff --git a/init.el b/init.el
index e750792..beadab3 100644
--- a/init.el
+++ b/init.el
@@ -839,17 +839,6 @@
(bind-keys :map km/magit-map
("l" . magit-toggle-buffer-lock))
- (bind-keys :map km/magit-wip-map
- ("a" . magit-wip-after-apply-mode)
- ("b" . magit-wip-before-change-mode)
- ("c" . magit-wip-commit)
- ("f" . magit-wip-commit-buffer-file)
- ("l" . magit-wip-log-current)
- ("o" . magit-wip-log)
- ("s" . magit-wip-after-save-mode)
- ("S" . magit-wip-after-save-local-mode))
- (magit-wip-after-save-mode 1)
-
(define-key magit-popup-mode-map (kbd "SPC <t>")
#'magit-invoke-popup-switch)
(define-key magit-popup-mode-map (kbd "SPC SPC <t>")
@@ -868,10 +857,6 @@
(magit-define-popup-action 'magit-log-popup
?e "Edit options" 'magit-log-refresh-popup)
- (magit-define-popup-action 'magit-log-popup
- ?w "Log current WIP" 'magit-wip-log-current)
- (magit-define-popup-action 'magit-log-popup
- ?W "Log other WIP" 'magit-wip-log)
(magit-change-popup-key 'magit-branch-popup :action
?c ?o)
@@ -887,6 +872,26 @@
(lambda (f rev &rest _) (funcall f rev "--no-ff"))
'((name . "no-ff"))))
+(use-package magit-wip
+ :defer t
+ :config
+ (bind-keys :map km/magit-wip-map
+ ("a" . magit-wip-after-apply-mode)
+ ("b" . magit-wip-before-change-mode)
+ ("c" . magit-wip-commit)
+ ("f" . magit-wip-commit-buffer-file)
+ ("l" . magit-wip-log-current)
+ ("o" . magit-wip-log)
+ ("s" . magit-wip-after-save-mode)
+ ("S" . magit-wip-after-save-local-mode))
+
+ (magit-define-popup-action 'magit-log-popup
+ ?w "Log current WIP" 'magit-wip-log-current)
+ (magit-define-popup-action 'magit-log-popup
+ ?W "Log other WIP" 'magit-wip-log)
+
+ (magit-wip-after-save-mode 1))
+
(use-package km-magit
:defer t
:after magit