From f7445a10dbe62ba294d42242ef2d2c6ee0dbc257 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 18 Feb 2020 22:56:47 -0500
Subject: [PATCH] General refactor & reformatting across the board

---
 bin/doom                          | 8 ++++----
 core/cli/autoloads.el             | 7 ++++---
 core/core-projects.el             | 4 ++--
 core/core-ui.el                   | 4 ++--
 modules/lang/plantuml/packages.el | 2 ++
 modules/term/vterm/config.el      | 2 +-
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/bin/doom b/bin/doom
index 8d23b15e3..5ac35bf82 100755
--- a/bin/doom
+++ b/bin/doom
@@ -57,10 +57,10 @@ with a different private module."
       (setq command "help"))
 
     (when (equal (user-real-uid) 0)
-      (message
-       (concat "WARNING: This script is running as root. This isn't necessary and is likely\n"
-               "unintentional. It will cause file permissions errors later if you use this\n"
-               "Doom installation on a non-root account.\n"))
+      (print!
+       (concat "WARNING: This script is running as root. This likely wasn't intentional, and\n"
+               "is unnecessary to use this script. This will cause file permissions errors\n"
+               "later if you use this Doom installation on a non-root account.\n"))
       (unless (or doom-auto-accept (y-or-n-p "Continue anyway?"))
         (user-error "Aborted")))
 
diff --git a/core/cli/autoloads.el b/core/cli/autoloads.el
index 700e0523c..4cd2e5fd0 100644
--- a/core/cli/autoloads.el
+++ b/core/cli/autoloads.el
@@ -33,9 +33,10 @@ one wants that.")
      (and (print! (start "Generating core autoloads..."))
           (doom-cli--write-autoloads
            file (doom-cli--generate-autoloads
-                 (cl-loop for dir in (append (list doom-core-dir)
-                                             (cdr (doom-module-load-path 'all-p))
-                                             (list doom-private-dir))
+                 (cl-loop for dir
+                          in (append (list doom-core-dir)
+                                     (cdr (doom-module-load-path 'all-p))
+                                     (list doom-private-dir))
                           if (doom-glob dir "autoload.el") collect it
                           if (doom-glob dir "autoload/*.el") append it)
                  'scan))
diff --git a/core/core-projects.el b/core/core-projects.el
index 9c08a0872..6f978fc01 100644
--- a/core/core-projects.el
+++ b/core/core-projects.el
@@ -54,8 +54,8 @@ Emacs.")
   ;;   searches from the current directory down to / for certain project
   ;;   markers, like package.json, setup.py, or Cargo.toml
   ;; + `projectile-root-top-down-recurring' -> consults
-  ;;   `projectile-project-root-files-top-down-recurring'; searches from the
-  ;;   current directory down to / for a directory that has .svn or Makefile but
+  ;;   `projectile-project-root-files-top-down-recurring'; e.g. searches from
+  ;;   the current directory down to / for a directory that has Makefile but
   ;;   doesn't have a parent with one of those files.
   ;;
   ;; In the interest of performance, we reduce the number of project root marker
diff --git a/core/core-ui.el b/core/core-ui.el
index 4ffb2f450..8d02d4210 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -480,8 +480,8 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
          (defadvice! doom--disable-all-the-icons-in-tty-a (orig-fn &rest args)
            "Return a blank string in tty Emacs, which doesn't support multiple fonts."
            :around '(all-the-icons-octicon all-the-icons-material
-                                           all-the-icons-faicon all-the-icons-fileicon
-                                           all-the-icons-wicon all-the-icons-alltheicon)
+                     all-the-icons-faicon all-the-icons-fileicon
+                     all-the-icons-wicon all-the-icons-alltheicon)
            (if (or (not after-init-time) (display-multi-font-p))
                (apply orig-fn args)
              "")))
diff --git a/modules/lang/plantuml/packages.el b/modules/lang/plantuml/packages.el
index b9b6956fd..129f2b550 100644
--- a/modules/lang/plantuml/packages.el
+++ b/modules/lang/plantuml/packages.el
@@ -4,3 +4,5 @@
 (package! plantuml-mode :pin "ea45a13707")
 (when (featurep! :checkers syntax)
   (package! flycheck-plantuml :pin "183be89e1d"))
+
+;; ob-plantuml is provided by org-plus-contrib
diff --git a/modules/term/vterm/config.el b/modules/term/vterm/config.el
index 6abec4d96..097e9d597 100644
--- a/modules/term/vterm/config.el
+++ b/modules/term/vterm/config.el
@@ -1,7 +1,7 @@
 ;;; term/vterm/config.el -*- lexical-binding: t; -*-
 
 (use-package! vterm
-  :when module-file-suffix
+  :when (boundp 'module-file-suffix)
   :defer t
   :preface (setq vterm-install t)
   :config