From c82faf7f10ada519fca9983d8d245aecc092e309 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 19 Feb 2019 15:03:14 -0500
Subject: [PATCH] General reformatting & minor refactors

---
 core/autoload/packages.el          | 2 +-
 core/core-keybinds.el              | 4 ++--
 core/core-ui.el                    | 2 +-
 modules/lang/data/config.el        | 2 +-
 modules/ui/window-select/config.el | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/autoload/packages.el b/core/autoload/packages.el
index 3a7558bda..1e0e12756 100644
--- a/core/autoload/packages.el
+++ b/core/autoload/packages.el
@@ -372,7 +372,7 @@ package.el as appropriate."
   (cl-check-type name symbol)
   (doom-initialize-packages)
   (unless (package-installed-p name)
-    (user-error "%s isn't installed" name))
+    (error "%s isn't installed" name))
   (when (doom-package-different-backend-p name)
     (user-error "%s's backend has changed and must be uninstalled first" name))
   (when (or force-p (doom-package-outdated-p name))
diff --git a/core/core-keybinds.el b/core/core-keybinds.el
index e6951dbff..acbfe37eb 100644
--- a/core/core-keybinds.el
+++ b/core/core-keybinds.el
@@ -76,14 +76,14 @@ If any hook returns non-nil, all hooks after it are ignored.")
 (after! evil
   (defmacro define-leader-key! (&rest args)
     `(general-define-key
-      :states '(normal visual motion insert emacs)
+      :states '(normal visual motion emacs)
       :keymaps 'doom-leader-map
       :prefix doom-leader-key
       :non-normal-prefix doom-leader-alt-key
       ,@args))
 
   (general-create-definer define-localleader-key!
-    :states '(normal visual motion insert emacs)
+    :states '(normal visual motion emacs)
     :major-modes t
     :wk-full-keys nil
     :prefix doom-localleader-key
diff --git a/core/core-ui.el b/core/core-ui.el
index 5af0bdffd..125310083 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -251,7 +251,7 @@ behavior). Do not set this directly, this is let-bound in `doom|init-theme'.")
 (setq whitespace-line-column nil
       whitespace-style
       '(face indentation tabs tab-mark spaces space-mark newline newline-mark
-             trailing lines-tail)
+        trailing lines-tail)
       whitespace-display-mappings
       '((tab-mark ?\t [?› ?\t])
         (newline-mark ?\n [?¬ ?\n])
diff --git a/modules/lang/data/config.el b/modules/lang/data/config.el
index d97901bc1..c18fb15a9 100644
--- a/modules/lang/data/config.el
+++ b/modules/lang/data/config.el
@@ -27,7 +27,7 @@
   :mode "\\.gql\\'")
 
 (def-package! json-mode
-  :mode "\\.js\\(?:on\\|[hl]int\\(rc\\)?\\)\\'"
+  :mode "\\.js\\(?:on\\|[hl]int\\(?:rc\\)?\\)\\'"
   :config
   (set-electric! 'json-mode :chars '(?\n ?: ?{ ?})))
 
diff --git a/modules/ui/window-select/config.el b/modules/ui/window-select/config.el
index 3989310e3..3bc5c032c 100644
--- a/modules/ui/window-select/config.el
+++ b/modules/ui/window-select/config.el
@@ -4,7 +4,7 @@
   :when (featurep! +switch-window)
   :defer t
   :init
-  (define-key global-map [remap other-window] #'switch-window)
+  (global-set-key [remap other-window] #'switch-window)
   :config
   (setq switch-window-shortcut-style 'qwerty
         switch-window-qwerty-shortcuts '("a" "s" "d" "f" "g" "h" "j" "k" "l")))
@@ -14,7 +14,7 @@
   :unless (featurep! +switch-window)
   :defer t
   :init
-  (define-key global-map [remap other-window] #'ace-window)
+  (global-set-key [remap other-window] #'ace-window)
   :config
   (setq aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l)
         aw-scope 'frame