From 92fd24ff0fdf1a82ce628536afea1c9a42b4549f Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 2 Jun 2018 02:39:31 +0200
Subject: [PATCH] config/default: refactor evil key fixes

Also fixes #643, which is caused because evil is disabled and these
fixes clumsily use evil-define-key* (which won't exist).
---
 modules/config/default/+bindings.el | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/config/default/+bindings.el b/modules/config/default/+bindings.el
index 90df0043c..b0c195c6f 100644
--- a/modules/config/default/+bindings.el
+++ b/modules/config/default/+bindings.el
@@ -717,7 +717,7 @@
 ;;
 
 ;; This section is dedicated to "fixing" certain keys so that they behave
-;; properly, more like vim, or how I like it.
+;; sensibly (and consistently with similar contexts).
 
 (define-key input-decode-map [S-iso-lefttab] [backtab])
 
@@ -725,7 +725,10 @@
 (unless window-system
   (define-key input-decode-map (kbd "TAB") [tab]))
 
-(after! evil
+(after! tabulated-list
+  (define-key tabulated-list-mode-map "q" #'quit-window))
+
+(when (featurep! :feature evil +everywhere)
   (evil-define-key* 'insert 'global
     ;; I want C-a and C-e to be a little smarter. C-a will jump to indentation.
     ;; Pressing it again will send you to the true bol. Same goes for C-e,
@@ -748,18 +751,14 @@
   (define-key! evil-ex-completion-map
     "\C-a" #'move-beginning-of-line
     "\C-b" #'backward-word
-    "\C-f" #'forward-word))
+    "\C-f" #'forward-word)
 
-(after! tabulated-list
-  (define-key tabulated-list-mode-map "q" #'quit-window))
-
-(after! view
-  (define-key view-mode-map (kbd "<escape>") #'View-quit-all))
+  (after! view
+    (define-key view-mode-map (kbd "<escape>") #'View-quit-all)))
 
 ;; Restore common editing keys (and ESC) in minibuffer
 (defun +default|fix-minibuffer-in-map (map)
-  (evil-define-key* nil map
-    [escape] #'abort-recursive-edit
+  (define-key! map
     "\C-a" #'move-beginning-of-line
     "\C-w" #'backward-kill-word
     "\C-u" #'backward-kill-sentence
@@ -767,7 +766,8 @@
     "\C-f" #'forward-word
     "\C-z" (λ! (ignore-errors (call-interactively #'undo))))
   (when (featurep! :feature evil +everywhere)
-    (evil-define-key* nil map
+    (define-key! map
+      [escape] #'abort-recursive-edit
       "\C-r" #'evil-paste-from-register
       "\C-j" #'next-line
       "\C-k" #'previous-line