From 0c9f1b1a9c10ebac7655e2be0ae993d58cd0af00 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 11 Jan 2020 17:27:04 -0500
Subject: [PATCH] Minor refactors & comment revision

---
 core/autoload/packages.el               |  1 +
 core/cli/packages.el                    |  2 +-
 core/packages.el                        |  4 ++--
 modules/editor/file-templates/config.el |  2 +-
 modules/lang/org/config.el              |  1 +
 modules/ui/modeline/autoload.el         | 10 +++++-----
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/autoload/packages.el b/core/autoload/packages.el
index 224009a2b..5a813da1c 100644
--- a/core/autoload/packages.el
+++ b/core/autoload/packages.el
@@ -155,6 +155,7 @@ was installed with."
       ((debug error)
        (signal 'doom-package-error
                (list (doom-module-from-path file)
+                     file
                      e))))))
 
 ;;;###autoload
diff --git a/core/cli/packages.el b/core/cli/packages.el
index c598da5b2..f7067ef0a 100644
--- a/core/cli/packages.el
+++ b/core/cli/packages.el
@@ -91,7 +91,7 @@ declaration) or dependency thereof that hasn't already been."
                     (cl-incf n))
              (error
               (signal 'doom-package-error
-                      (list e (straight--process-get-output))))))))
+                      (list package e (straight--process-get-output))))))))
      (if (= n 0)
          (ignore (print! (success "No packages need to be installed")))
        (print! (success "Installed & built %d packages") n)
diff --git a/core/packages.el b/core/packages.el
index d8bc3c210..b8573dc0c 100644
--- a/core/packages.el
+++ b/core/packages.el
@@ -24,8 +24,8 @@
 (package! so-long
   :built-in 'prefer ; included in Emacs 27+
   ;; REVIEW so-long is slated to be published to ELPA eventually, but until then
-  ;; I've created my own mirror for it because git.savannah.gnu.org runs on a
-  ;; potato.
+  ;;        I've created my own mirror for it because git.savannah.gnu.org runs
+  ;;        on a potato.
   :recipe (:host github :repo "hlissner/emacs-so-long"))
 (package! undo-tree)
 (package! ws-butler
diff --git a/modules/editor/file-templates/config.el b/modules/editor/file-templates/config.el
index 46248b5c7..8f1e00d30 100644
--- a/modules/editor/file-templates/config.el
+++ b/modules/editor/file-templates/config.el
@@ -9,7 +9,7 @@
 don't have a :trigger property in `+file-templates-alist'.")
 
 (defvar +file-templates-alist
-  `(;; General
+  '(;; General
     (gitignore-mode)
     (dockerfile-mode)
     ("/docker-compose\\.yml$" :mode yaml-mode)
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 31fb7283d..25356c36f 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -220,6 +220,7 @@ path too.")
     (or (cdr (assoc lang org-src-lang-modes))
         (+org--babel-lazy-load lang)))
 
+  ;; This also works for tangling and exporting
   (defadvice! +org--babel-lazy-load-library-a (info)
     "Load babel libraries lazily when babel blocks are executed."
     :after-while #'org-babel-confirm-evaluate
diff --git a/modules/ui/modeline/autoload.el b/modules/ui/modeline/autoload.el
index 7162bd069..8f3eb1839 100644
--- a/modules/ui/modeline/autoload.el
+++ b/modules/ui/modeline/autoload.el
@@ -22,11 +22,11 @@ Meant for `doom-change-font-size-hook'."
   (let ((default-height +modeline--old-bar-height)
         (scale (or (frame-parameter nil 'font-scale) 0)))
     (if (> scale 0)
-        (let* ((font-size (string-to-number
-                           (aref (doom--font-name (frame-parameter nil 'font)
-                                                  (selected-frame))
-                                 xlfd-regexp-pixelsize-subnum)))
-               (scale (frame-parameter nil 'font-scale)))
+        (let ((font-size (string-to-number
+                          (aref (doom--font-name (frame-parameter nil 'font)
+                                                 (selected-frame))
+                                xlfd-regexp-pixelsize-subnum)))
+              (scale (frame-parameter nil 'font-scale)))
           (setq doom-modeline-height (+ default-height (* scale doom-font-increment))))
       (setq doom-modeline-height default-height))))