From 0594d4d8232be5b4b232affe8319b400f988870a Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 17 Jun 2019 21:57:35 +0200
Subject: Emacs: appease evil-collection config check

---
 emacs/.emacs.d/main.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 8054272..b82a128 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -14,10 +14,6 @@
 (use-package crux
   :custom ((crux-reopen-as-root-mode t)))
 
-;;; evil pre-init
-(custom-set-variables '(evil-want-integration t)
-		      '(evil-want-keybinding nil))
-
 ;;; Styles
 
 ;; I prefer an always-visible cursor.  Feels less distracting.
@@ -170,6 +166,11 @@ With two prefix arguments, write out the day and month name."
 (use-package evil
   :demand t
   :after (undo-tree)
+  :init (progn
+	  (defvar evil-want-integration)
+	  (defvar evil-want-keybinding)
+	  (setq evil-want-integration t
+		evil-want-keybinding nil))
   :custom ((evil-shift-width 2)
            (evil-mode-line-format '(before . mode-line-front-space)))
   :general
-- 
cgit 1.4.1