simplify evilem-default-keybindings: only bind evilem-map to a prefix

Author: wbolster

evil-easymotion.el

@@ -476,108 +476,7 @@
 ;;;###autoload
 (defun evilem-default-keybindings (prefix)
   "Define easymotions for all motions evil defines by default"
-  (define-key evil-motion-state-map (kbd prefix) nil)
-  (evilem-define (kbd (concat prefix " w")) #'evil-forward-word-begin
-                 :scope 'line)
-  (evilem-define (kbd (concat prefix " W")) #'evil-forward-WORD-begin
-                 :scope 'line)
-  (evilem-define (kbd (concat prefix " e")) #'evil-forward-word-end
-                 :scope 'line)
-  (evilem-define (kbd (concat prefix " E")) #'evil-forward-WORD-end
-                 :scope 'line)
-  (evilem-define (kbd (concat prefix " b")) #'evil-backward-word-begin
-                 :scope 'line)
-  (evilem-define (kbd (concat prefix " B")) #'evil-backward-WORD-begin
-                 :scope 'line)
-  (evilem-define (kbd (concat prefix " ge")) #'evil-backward-word-end
-                 :scope 'line)
-  (evilem-define (kbd (concat prefix " gE")) #'evil-backward-WORD-end
-                 :scope 'line)
-
-  (evilem-define (kbd (concat prefix " j")) #'next-line
-                 :pre-hook (setq evil-this-type 'line)
-                 :bind ((temporary-goal-column (current-column))
-                        (line-move-visual nil)))
-
-  (evilem-define (kbd (concat prefix " k")) #'previous-line
-                 :pre-hook (setq evil-this-type 'line)
-                 :bind ((temporary-goal-column (current-column))
-                        (line-move-visual nil)))
-
-  (evilem-define (kbd (concat prefix " g j")) #'next-line
-                 :pre-hook (setq evil-this-type 'line)
-                 :bind ((temporary-goal-column (current-column))
-                        (line-move-visual t)))
-
-  (evilem-define (kbd (concat prefix " g k")) #'previous-line
-                 :pre-hook (setq evil-this-type 'line)
-                 :bind ((temporary-goal-column (current-column))
-                        (line-move-visual t)))
-
-  (evilem-define (kbd (concat prefix " t")) #'evil-repeat-find-char
-                 :name 'evilem--motion-evil-find-char-to
-                 :pre-hook (save-excursion
-                             (setq evil-this-type 'inclusive)
-                             (call-interactively #'evil-find-char-to))
-                 :bind ((evil-cross-lines t)))
-
-  (evilem-define (kbd (concat prefix " T")) #'evil-repeat-find-char
-                 :name 'evilem--motion-evil-find-char-to-backward
-                 :pre-hook (save-excursion
-                             (setq evil-this-type 'exclusive)
-                             (call-interactively #'evil-find-char-to-backward))
-                 :bind ((evil-cross-lines t)))
-
-  (evilem-define (kbd (concat prefix " f")) #'evil-repeat-find-char
-                 :name 'evilem--motion-evil-find-char
-                 :pre-hook (save-excursion
-                             (setq evil-this-type 'inclusive)
-                             (call-interactively #'evil-find-char))
-                 :bind ((evil-cross-lines t)))
-
-  (evilem-define (kbd (concat prefix " F")) #'evil-repeat-find-char
-                 :name 'evilem--motion-evil-find-char-backward
-                 :pre-hook (save-excursion
-                             (setq evil-this-type 'exclusive)
-                             (call-interactively #'evil-find-char-backward))
-                 :bind ((evil-cross-lines t)))
-
-  (evilem-define (kbd (concat prefix " [[")) #'evil-backward-section-begin
-                 :pre-hook (setq evil-this-type 'line))
-
-  (evilem-define (kbd (concat prefix " []")) #'evil-backward-section-end
-                 :pre-hook (setq evil-this-type 'line))
-
-  (evilem-define (kbd (concat prefix " ]]")) #'evil-forward-section-begin
-                 :pre-hook (setq evil-this-type 'line))
-
-  (evilem-define (kbd (concat prefix " ][")) #'evil-forward-section-end
-                 :pre-hook (setq evil-this-type 'line))
-
-  (evilem-define (kbd (concat prefix " (")) #'evil-backward-sentence-begin)
-  (evilem-define (kbd (concat prefix " )")) #'evil-forward-sentence-begin)
-
-  (evilem-define (kbd (concat prefix " n")) #'evil-search-next
-                 :bind (((symbol-function #'isearch-lazy-highlight-update)
-                         #'ignore)
-                        (search-highlight nil)))
-  (evilem-define (kbd (concat prefix " N")) #'evil-search-previous
-                 :bind (((symbol-function #'isearch-lazy-highlight-update)
-                         #'ignore)
-                        (search-highlight nil)))
-  (evilem-define (kbd (concat prefix " *")) #'evil-search-word-forward
-                 :bind (((symbol-function #'isearch-lazy-highlight-update)
-                         #'ignore)
-                        (search-highlight nil)))
-  (evilem-define (kbd (concat prefix " #")) #'evil-search-word-backward
-                 :bind (((symbol-function #'isearch-lazy-highlight-update)
-                         #'ignore)
-                        (search-highlight nil)))
-
-  (evilem-define (kbd (concat prefix " -"))
-                 #'evil-previous-line-first-non-blank)
-  (evilem-define (kbd (concat prefix " +"))
-                 #'evil-next-line-first-non-blank))
+  (define-key evil-motion-state-map (kbd prefix) evilem-map))
 
 (define-key evilem-map "w" #'evilem-motion-forward-word-begin)
 (define-key evilem-map "W" #'evilem-motion-forward-WORD-begin)