From 4ad9e1813589d61a0b5c315e4cb27e209b9d776d Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 22 Jun 2018 12:02:31 +0200
Subject: [PATCH] +default/easymotion => +evil/easymotion

---
 modules/config/default/+bindings.el     |  2 +-
 modules/config/default/autoload/evil.el | 15 ---------------
 modules/feature/evil/autoload/evil.el   | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/config/default/+bindings.el b/modules/config/default/+bindings.el
index 0f97bca81..901696b74 100644
--- a/modules/config/default/+bindings.el
+++ b/modules/config/default/+bindings.el
@@ -162,7 +162,7 @@
             "M-RET"    (+ivy-do-action! #'+ivy-git-grep-other-window-action))))
 
       ;; easymotion
-      :m "gs" #'+default/easymotion  ; lazy-load `evil-easymotion'
+      :m "gs" #'+evil/easymotion  ; lazy-load `evil-easymotion'
       (:after evil-easymotion
         :map evilem-map
         "a" (evilem-create #'evil-forward-arg)
diff --git a/modules/config/default/autoload/evil.el b/modules/config/default/autoload/evil.el
index cb8453a6c..a813659a1 100644
--- a/modules/config/default/autoload/evil.el
+++ b/modules/config/default/autoload/evil.el
@@ -35,18 +35,3 @@
 buffers."
   (interactive "<a>")
   (doom/kill-matching-buffers pattern bang))
-
-;;;###autoload
-(defun +default/easymotion ()
-  "Invoke and lazy-load `evil-easymotion' without compromising which-key
-integration."
-  (interactive)
-  (let ((prefix (this-command-keys)))
-    (evil-define-key* 'motion 'global prefix nil)
-    (evilem-default-keybindings prefix)
-    (which-key-reload-key-sequence
-     (vconcat (when evil-this-operator
-                (where-is-internal evil-this-operator
-                                   evil-normal-state-map
-                                   t))
-              prefix))))
diff --git a/modules/feature/evil/autoload/evil.el b/modules/feature/evil/autoload/evil.el
index c6ab35535..27c89e0f2 100644
--- a/modules/feature/evil/autoload/evil.el
+++ b/modules/feature/evil/autoload/evil.el
@@ -370,3 +370,18 @@ more information on modifiers."
   "Call `doom/escape' if `evil-force-normal-state' is called interactively."
   (when (called-interactively-p 'any)
     (call-interactively #'doom/escape)))
+
+;;;###autoload
+(defun +evil/easymotion ()
+  "Invoke and lazy-load `evil-easymotion' without compromising which-key
+integration."
+  (interactive)
+  (let ((prefix (this-command-keys)))
+    (evil-define-key* 'motion 'global prefix nil)
+    (evilem-default-keybindings prefix)
+    (which-key-reload-key-sequence
+     (vconcat (when evil-this-operator
+                (where-is-internal evil-this-operator
+                                   evil-normal-state-map
+                                   t))
+              prefix))))