From 46499ec70fae2b311f7bafe986db4af1e9d020b0 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 31 Dec 2018 15:54:55 -0500
Subject: [PATCH] config/default: minor keybind refactor

---
 modules/config/default/+evil-bindings.el | 2 +-
 modules/config/default/config.el         | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index 865182ba7..027cb3ff6 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -25,7 +25,7 @@
       [remap find-tag]         #'projectile-find-tag
 
       ;; Smart tab
-      :i [tab] (general-predicate-dispatch nil
+      :i [tab] (general-predicate-dispatch nil ; fall back to nearest keymap
                  (and (featurep! :feature snippets)
                       (yas-maybe-expand-abbrev-key-filter 'yas-expand))
                  'yas-expand
diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index 835cf66e4..09e10fedc 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -135,16 +135,15 @@
 ;; Doom's keybinding scheme
 
 (when (featurep! +bindings)
-  ;; Ensure Emacsien motions are available
-  (map! "C-b" #'backward-word
-        "C-f" #'forward-word)
-
   ;; Make M-x more accessible
   (define-key! 'override
     "M-x"  #'execute-extended-command
     "A-x"  #'execute-extended-command)
 
   (define-key!
+    ;; Ensure Emacsien motions are available
+    "C-b" #'backward-word
+    "C-f" #'forward-word
     ;; Buffer-local font scaling
     "M-+" (λ! (text-scale-set 0))
     "M-=" #'text-scale-increase