From 748b1976762c22654121e41762e3c30b1770f8b4 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Thu, 7 Mar 2019 23:21:58 -0500
Subject: [PATCH] Minor, general refactors

---
 core/core-editor.el              | 11 ++++++-----
 core/core-lib.el                 |  9 +++++----
 core/core-modules.el             |  7 +++----
 modules/config/default/config.el |  4 ++--
 modules/ui/modeline/config.el    |  1 +
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/core/core-editor.el b/core/core-editor.el
index 0972e1856..f21104a58 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -273,11 +273,12 @@ savehist file."
 (def-package! helpful
   :defer t
   :init
-  (global-set-key [remap describe-function] #'helpful-callable)
-  (global-set-key [remap describe-command]  #'helpful-command)
-  (global-set-key [remap describe-variable] #'helpful-variable)
-  (global-set-key [remap describe-key]      #'helpful-key)
-  (global-set-key [remap describe-symbol]   #'helpful-symbol))
+  (define-key!
+    [remap describe-function] #'helpful-callable
+    [remap describe-command]  #'helpful-command
+    [remap describe-variable] #'helpful-variable
+    [remap describe-key]      #'helpful-key
+    [remap describe-symbol]   #'helpful-symbol))
 
 
 (def-package! ws-butler
diff --git a/core/core-lib.el b/core/core-lib.el
index 2de8110c9..1deb4ae74 100644
--- a/core/core-lib.el
+++ b/core/core-lib.el
@@ -114,10 +114,11 @@ Accepts the same arguments as `message'."
         ,(concat (propertize "DOOM " 'face 'font-lock-comment-face)
                  format-string
                  (when doom--current-module
-                   (propertize (format " [%s/%s]"
-                                       (doom-keyword-name (car doom--current-module))
-                                       (cdr doom--current-module))
-                               'face 'warning)))
+                   (propertize
+                    (format " [%s/%s]"
+                            (doom-keyword-name (car doom--current-module))
+                            (cdr doom--current-module))
+                    'face 'warning)))
         ,@args))))
 
 (defun FILE! ()
diff --git a/core/core-modules.el b/core/core-modules.el
index dd84efbb1..85844bc14 100644
--- a/core/core-modules.el
+++ b/core/core-modules.el
@@ -84,7 +84,7 @@ non-nil."
 
 
 ;;
-;; Module API
+;;; Module API
 
 (defun doom-module-p (category module)
   "Returns t if CATEGORY MODULE is enabled (ie. present in `doom-modules')."
@@ -194,7 +194,6 @@ non-nil, return paths of possible modules, activated or otherwise."
       (let ((noninteractive t)
             doom-modules
             doom-init-modules-p)
-        (message "Initializing modules")
         (load! "init" doom-private-dir t)
         (or doom-modules
             (make-hash-table :test 'equal
@@ -203,7 +202,7 @@ non-nil, return paths of possible modules, activated or otherwise."
 
 
 ;;
-;; Use-package modifications
+;;; Use-package modifications
 
 (autoload 'use-package "use-package-core" nil nil t)
 
@@ -292,7 +291,7 @@ non-nil, return paths of possible modules, activated or otherwise."
 
 
 ;;
-;; Module config macros
+;;; Module config macros
 
 (defmacro doom! (&rest modules)
   "Bootstraps DOOM Emacs and its modules.
diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index fd7177cbb..4ab92c141 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -29,9 +29,9 @@
 
 (if (not (featurep 'evil))
     (delete-selection-mode +1)
-  (defun turn-off-delete-selection-mode () (delete-selection-mode -1))
+  (defun +default|disable-delete-selection-mode () (delete-selection-mode -1))
   (add-hook 'evil-insert-state-entry-hook #'delete-selection-mode)
-  (add-hook 'evil-insert-state-exit-hook #'turn-off-delete-selection-mode))
+  (add-hook 'evil-insert-state-exit-hook  #'+default|disable-delete-selection-mode))
 
 
 (when (featurep! +smartparens)
diff --git a/modules/ui/modeline/config.el b/modules/ui/modeline/config.el
index 57ccbfff8..709904ec7 100644
--- a/modules/ui/modeline/config.el
+++ b/modules/ui/modeline/config.el
@@ -35,6 +35,7 @@
     (propertize (format "%s%d"
                         (if indent-tabs-mode "⭾" "␣")
                         tab-width)
+                'face (if (doom-modeline--active) 'mode-line 'mode-line-inactive)
                 'mouse-face 'mode-line-highlight
                 'help-echo
                 (let ((subsegs