From 3b7711420fd586ff4d935cfda1614507ac918c3d Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 6 Sep 2019 00:25:35 -0400
Subject: [PATCH] General comment revision & cleanup

---
 core/core-editor.el                      | 4 ++--
 core/core.el                             | 4 +++-
 core/packages.el                         | 2 ++
 modules/config/default/+evil-bindings.el | 2 +-
 modules/lang/data/config.el              | 9 ++++-----
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/core/core-editor.el b/core/core-editor.el
index 6cf1543bd..f66fcc1c5 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -111,8 +111,8 @@ successfully sets indent_style/indent_size.")
   ;;
   ;; This is because autorevert abuses the heck out of inotify handles which can
   ;; grind Emacs to a halt if you do expensive IO (outside of Emacs) on the
-  ;; files you have open (like compression). We only really need revert changes
-  ;; when we switch to a buffer or when we focus the Emacs frame.
+  ;; files you have open (like compression). We only really need to revert
+  ;; changes when we switch to a buffer or when we focus the Emacs frame.
   (defun doom-auto-revert-buffer-h ()
     "Auto revert current buffer, if necessary."
     (unless auto-revert-mode
diff --git a/core/core.el b/core/core.el
index 9467207e7..cc2c98c81 100644
--- a/core/core.el
+++ b/core/core.el
@@ -146,7 +146,9 @@ users).")
 ;; to, it's our (the user's) failure. One case for all!
 (setq auto-mode-case-fold nil)
 
-;; Enable all disabled commands.
+;; Some commands are disabled and emit a warning whenever they are used. Let's
+;; assume the user always knows what they're doing (hahahaha) and enable all
+;; disabled commands.
 (setq disabled-command-function nil)
 
 ;; Display the bare minimum at startup. We don't need all that noise. The
diff --git a/core/packages.el b/core/packages.el
index ef8f55c9f..f9767c958 100644
--- a/core/packages.el
+++ b/core/packages.el
@@ -9,6 +9,8 @@
 (package! all-the-icons)
 (package! hide-mode-line)
 (package! highlight-numbers)
+;; Some early 26.x builds of Emacs do not have `display-line-numbers' yet, so
+;; check for it instead of Emacs' version.
 (unless (locate-library "display-line-numbers")
   (package! nlinum)
   (package! nlinum-hl)
diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index 1d364381d..0778309ca 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -54,7 +54,7 @@
         [remap quit-window] #'kill-current-buffer)
 
       (:map (help-mode-map helpful-mode-map)
-        :n "o" 'ace-link-help)
+        :n "o" #'ace-link-help)
 
       ;; misc
       :n "C-S-f"  #'toggle-frame-fullscreen
diff --git a/modules/lang/data/config.el b/modules/lang/data/config.el
index 2692fac8c..035c96f0d 100644
--- a/modules/lang/data/config.el
+++ b/modules/lang/data/config.el
@@ -18,7 +18,7 @@
 ;;
 ;;; Third-party plugins
 
-;; `csv-mode'
+;;;###package csv-mode
 (map! :after csv-mode
       :localleader
       :map csv-mode-map
@@ -37,13 +37,12 @@
   :config
   (set-electric! 'json-mode :chars '(?\n ?: ?{ ?})))
 
-(use-package! jsonnet-mode
-  :defer t
-  :config
+(after! jsonnet-mode
   (set-electric! 'jsonnet-mode :chars '(?\n ?: ?{ ?})))
 
+
 ;;
-;; Frameworks
+;;; Frameworks
 
 (def-project-mode! +data-vagrant-mode
   :files ("Vagrantfile"))