From 42adde95ec65d3c1c44fdabcd68dbb26d6934aa8 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Wed, 10 Jan 2018 22:26:12 -0500 Subject: [PATCH] git: remove old evilification of magit buffers --- layers/+source-control/git/packages.el | 189 ------------------------- 1 file changed, 189 deletions(-) diff --git a/layers/+source-control/git/packages.el b/layers/+source-control/git/packages.el index fc3bf7744..1fdf2e053 100644 --- a/layers/+source-control/git/packages.el +++ b/layers/+source-control/git/packages.el @@ -170,195 +170,6 @@ Press [_b_] again to blame further in the history, [_q_] to go up or quit." :bindings (kbd "gr") 'magit-list-repositories (kbd "RET") 'magit-repolist-status) - (unless (configuration-layer/package-used-p 'evil-magit) - ;; use auto evilification if `evil-magit' is not used - (evilified-state-evilify-map magit-mode-map - :bindings - "gr" 'magit-refresh - "gR" 'magit-refresh-all) - (evilified-state-evilify-map magit-status-mode-map - :mode magit-status-mode - :bindings - (kbd "C-S-j") 'magit-section-forward - (kbd "C-S-k") 'magit-section-backward - (kbd "C-n") 'magit-section-forward - (kbd "C-p") 'magit-section-backward) - (evilified-state-evilify-map magit-refs-mode-map - :mode magit-refs-mode - :bindings - (kbd "C-S-j") 'magit-section-forward - (kbd "C-S-k") 'magit-section-backward - (kbd "C-n") 'magit-section-forward - (kbd "C-p") 'magit-section-backward) - (evilified-state-evilify-map magit-blame-mode-map - :mode magit-blame-mode - :bindings - (kbd "C-S-j") 'magit-section-forward - (kbd "C-S-k") 'magit-section-backward - (kbd "C-n") 'magit-section-forward - (kbd "C-p") 'magit-section-backward) - (evilified-state-evilify-map magit-hunk-section-map - :mode magit-status-mode - :bindings - (kbd "C-S-j") 'magit-section-forward - (kbd "C-S-k") 'magit-section-backward - (kbd "C-n") 'magit-section-forward - (kbd "C-p") 'magit-section-backward) - (evilified-state-evilify-map magit-diff-mode-map - :mode magit-diff-mode - :bindings - (kbd "C-S-j") 'magit-section-forward - (kbd "C-S-k") 'magit-section-backward - (kbd "C-n") 'magit-section-forward - (kbd "C-p") 'magit-section-backward) - (evilified-state-evilify-map magit-log-read-revs-map - :mode magit-log-read-revs - :bindings - (kbd "C-S-j") 'magit-section-forward - (kbd "C-S-k") 'magit-section-backward - (kbd "C-n") 'magit-section-forward - (kbd "C-p") 'magit-section-backward) - (evilified-state-evilify-map magit-log-mode-map - :mode magit-log-mode - :bindings - (kbd "C-S-j") 'magit-section-forward - (kbd "C-S-k") 'magit-section-backward - (kbd "C-n") 'magit-section-forward - (kbd "C-p") 'magit-section-backward) - (evilified-state-evilify-map magit-log-select-mode-map - :mode magit-log-select-mode - :bindings - (kbd "C-S-j") 'magit-section-forward - (kbd "C-S-k") 'magit-section-backward - (kbd "C-n") 'magit-section-forward - (kbd "C-p") 'magit-section-backward) - (evilified-state-evilify-map magit-cherry-mode-map - :mode magit-cherry-mode - :bindings - (kbd "C-S-j") 'magit-section-forward - (kbd "C-S-k") 'magit-section-backward - (kbd "C-n") 'magit-section-forward - (kbd "C-p") 'magit-section-backward) - (evilified-state-evilify-map magit-reflog-mode-map - :mode magit-reflog-mode - :bindings - (kbd "C-S-j") 'magit-section-forward - (kbd "C-S-k") 'magit-section-backward - (kbd "C-n") 'magit-section-forward - (kbd "C-p") 'magit-section-backward) - (evilified-state-evilify-map magit-process-mode-map - :mode magit-process-mode - :bindings - (kbd "C-S-j") 'magit-section-forward - (kbd "C-S-k") 'magit-section-backward - (kbd "C-n") 'magit-section-forward - (kbd "C-p") 'magit-section-backward) - (evilified-state-evilify-map magit-stash-mode-map - :mode magit-stash-mode - :bindings - (kbd "C-S-j") 'magit-section-forward - (kbd "C-S-k") 'magit-section-backward - (kbd "C-n") 'magit-section-forward - (kbd "C-p") 'magit-section-backward) - (evilified-state-evilify-map git-rebase-mode-map - :mode git-rebase-mode - :bindings - (kbd "C-S-j") 'magit-section-forward - (kbd "C-S-k") 'magit-section-backward - (kbd "C-n") 'magit-section-forward - (kbd "C-p") 'magit-section-backward - "J" 'git-rebase-move-line-down - "K" 'git-rebase-move-line-up - "u" 'git-rebase-undo - "y" 'git-rebase-insert) - ;; default state for additional modes - (dolist (mode '(magit-popup-mode - magit-popup-sequence-mode)) - (evil-set-initial-state mode 'emacs)) - (let ((refresh-key "gr") - (refresh-all-key "gR") - (delete-key (nth 0 (where-is-internal 'magit-delete-thing - magit-mode-map)))) - (evilified-state--configure-default-state 'magit-revision-mode) - ;; section maps - (eval `(evilified-state-evilify-map magit-tag-section-map - :pre-bindings - ,delete-key 'magit-tag-delete - :bindings - ,refresh-key 'magit-refresh - ,refresh-all-key 'magit-refresh-all)) - (eval `(evilified-state-evilify-map magit-untracked-section-map - :pre-bindings - ,delete-key 'magit-discard - :bindings - ,refresh-key 'magit-refresh - ,refresh-all-key 'magit-refresh-all)) - (eval `(evilified-state-evilify-map magit-branch-section-map - :pre-bindings - ,delete-key 'magit-branch-delete - :bindings - ,refresh-key 'magit-refresh - ,refresh-all-key 'magit-refresh-all)) - (eval `(evilified-state-evilify-map magit-remote-section-map - :pre-bindings - ,delete-key 'magit-remote-remove - :bindings - ,refresh-key 'magit-refresh - ,refresh-all-key 'magit-refresh-all)) - (eval `(evilified-state-evilify-map magit-file-section-map - :pre-bindings - ,delete-key 'magit-discard - :bindings - ,refresh-key 'magit-refresh - ,refresh-all-key 'magit-refresh-all)) - (eval `(evilified-state-evilify-map magit-hunk-section-map - :pre-bindings - ,delete-key 'magit-discard - :bindings - ,refresh-key 'magit-refresh - ,refresh-all-key 'magit-refresh-all)) - (eval `(evilified-state-evilify-map magit-unstaged-section-map - :pre-bindings - ,delete-key 'magit-discard - :bindings - ,refresh-key 'magit-refresh - ,refresh-all-key 'magit-refresh-all)) - (eval `(evilified-state-evilify-map magit-staged-section-map - :pre-bindings - ,delete-key 'magit-discard - :bindings - ,refresh-key 'magit-refresh - ,refresh-all-key 'magit-refresh-all)) - (eval `(evilified-state-evilify-map magit-commit-section-map - :pre-bindings - ,delete-key 'magit-discard - :bindings - ,refresh-key 'magit-refresh - ,refresh-all-key 'magit-refresh-all)) - (eval `(evilified-state-evilify-map magit-stashes-section-map - :pre-bindings - ,delete-key 'magit-stash-clear - :bindings - ,refresh-key 'magit-refresh - ,refresh-all-key 'magit-refresh-all)) - (eval `(evilified-state-evilify-map magit-stash-section-map - :pre-bindings - ,delete-key 'magit-stash-drop - :bindings - ,refresh-key 'magit-refresh - ,refresh-all-key 'magit-refresh-all)) - (eval `(evilified-state-evilify-map magit-module-commit-section-map - :bindings - ,refresh-key 'magit-refresh - ,refresh-all-key 'magit-refresh-all)) - (eval `(evilified-state-evilify-map magit-unpulled-section-map - :bindings - ,refresh-key 'magit-refresh - ,refresh-all-key 'magit-refresh-all)) - (eval `(evilified-state-evilify-map magit-unpushed-section-map - :bindings - ,refresh-key 'magit-refresh - ,refresh-all-key 'magit-refresh-all)))) ;; confirm/abort (when dotspacemacs-major-mode-leader-key (add-hook 'with-editor-mode-hook 'evil-normalize-keymaps)