From b079db8ec3a2024fca60dcc9ddc3b4f2637c0905 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 10 Jun 2018 17:18:39 +0200
Subject: [PATCH] Refactor unneeded arg out of local function _load

In doom-initialize-packages.
---
 core/core-dispatcher.el | 2 +-
 core/core-packages.el   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/core-dispatcher.el b/core/core-dispatcher.el
index 0db531811..f30e5aafd 100644
--- a/core/core-dispatcher.el
+++ b/core/core-dispatcher.el
@@ -173,7 +173,7 @@ respectively."
 
 (def-dispatcher! test
   "Run Doom unit tests."
-  (load! "autoload/test")
+  (require 'core-unit-tests)
   (doom//run-tests args))
 
 (def-dispatcher! info
diff --git a/core/core-packages.el b/core/core-packages.el
index 37a787b5d..865294ef4 100644
--- a/core/core-packages.el
+++ b/core/core-packages.el
@@ -368,17 +368,17 @@ them."
           (setq doom-packages nil)
           (cl-flet
               ((_load
-                (file &optional noerror interactive)
+                (file &optional noerror)
                 (condition-case-unless-debug ex
-                    (let ((noninteractive (not interactive)))
-                      (load file noerror 'nomessage 'nosuffix))
+                    (load file noerror 'nomessage 'nosuffix)
                   ('error
                    (lwarn 'doom-initialize-packages :warning
                           "%s in %s: %s"
                           (car ex)
                           (file-relative-name file doom-emacs-dir)
                           (error-message-string ex))))))
-            (let ((doom--stage 'packages))
+            (let ((doom--stage 'packages)
+                  (noninteractive t))
               (_load (expand-file-name "packages.el" doom-core-dir))
               ;; We load the private packages file twice to ensure disabled
               ;; packages are seen ASAP, and a second time to ensure privately