emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

private/default: fix void variable errors when evil module is disabled

Browse source 
Evil keymaps don't exist if the evil module is off, so wrap evil-mode
keymap bindings in (:after evil ...)
This commit is contained in:
Henrik Lissner 2018-01-05 23:59:39 -05:00
parent 42cee2e046
commit 4b8315466b
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 33 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

67
modules/private/default/+bindings.el
View file

@ -314,28 +314,6 @@
;; paste from recent yank register (which isn't overwritten)
:v "C-p" "\"0p"
(:map evil-window-map ; prefix "C-w"
;; Navigation
"C-h" #'evil-window-left
"C-j" #'evil-window-down
"C-k" #'evil-window-up
"C-l" #'evil-window-right
"C-w" #'other-window
;; Swapping windows
"H" #'+evil/window-move-left
"J" #'+evil/window-move-down
"K" #'+evil/window-move-up
"L" #'+evil/window-move-right
"C-S-w" #'ace-swap-window
;; Window undo/redo
"u" #'winner-undo
"C-u" #'winner-undo
"C-r" #'winner-redo
"o" #'doom/window-enlargen
;; Delete window
"c" #'+workspace/close-window-or-workspace
"C-C" #'ace-delete-window)
;; --- Plugin bindings ------------------------------
;; auto-yasnippet
@ -384,6 +362,36 @@
"C-SPC" #'ivy-call-and-recenter ; preview
"M-RET" (+ivy-do-action! #'+ivy-git-grep-other-window-action)))
;; evil
(:after evil
:textobj "a" #'evil-inner-arg #'evil-outer-arg
:textobj "B" #'evil-textobj-anyblock-inner-block #'evil-textobj-anyblock-a-block
:textobj "i" #'evil-indent-plus-i-indent #'evil-indent-plus-a-indent
:textobj "I" #'evil-indent-plus-i-indent-up #'evil-indent-plus-a-indent-up
:textobj "J" #'evil-indent-plus-i-indent-up-down #'evil-indent-plus-a-indent-up-down
(:map evil-window-map ; prefix "C-w"
;; Navigation
"C-h" #'evil-window-left
"C-j" #'evil-window-down
"C-k" #'evil-window-up
"C-l" #'evil-window-right
"C-w" #'other-window
;; Swapping windows
"H" #'+evil/window-move-left
"J" #'+evil/window-move-down
"K" #'+evil/window-move-up
"L" #'+evil/window-move-right
"C-S-w" #'ace-swap-window
;; Window undo/redo
"u" #'winner-undo
"C-u" #'winner-undo
"C-r" #'winner-redo
"o" #'doom/window-enlargen
;; Delete window
"c" #'+workspace/close-window-or-workspace
"C-C" #'ace-delete-window))
;; evil-commentary
:n "gc" #'evil-commentary
@ -619,14 +627,6 @@
"<M-right>" nil))
;; --- Custom evil text-objects ---------------------
:textobj "a" #'evil-inner-arg #'evil-outer-arg
:textobj "B" #'evil-textobj-anyblock-inner-block #'evil-textobj-anyblock-a-block
:textobj "i" #'evil-indent-plus-i-indent #'evil-indent-plus-a-indent
:textobj "I" #'evil-indent-plus-i-indent-up #'evil-indent-plus-a-indent-up
:textobj "J" #'evil-indent-plus-i-indent-up-down #'evil-indent-plus-a-indent-up-down
;; --- Built-in plugins -----------------------------
(:after comint
;; TAB auto-completion in term buffers
@ -709,8 +709,6 @@
minibuffer-local-completion-map
minibuffer-local-must-match-map
minibuffer-local-isearch-map
evil-ex-completion-map
evil-ex-search-keymap
read-expression-map)
[escape] #'abort-recursive-edit
"C-r" #'evil-paste-from-register
@ -725,8 +723,9 @@
"M-;" #'eval-expression
"A-;" #'eval-expression)
(:map tabulated-list-mode-map
[remap evil-record-macro] #'doom/popup-close-maybe)
(:after tabulated-list
(:map tabulated-list-mode-map
[remap evil-record-macro] #'quit-window))
(:after view
(:map view-mode-map "<escape>" #'View-quit-all)))