From a4aab456566e9af4dfc8e4f9e86ebd5c3c01861d Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Wed, 22 Jun 2022 16:16:04 +0200
Subject: [PATCH] fix(emacs-lisp): flycheck false positives in Doom configs

---
 core/core-cli-lib.el                | 3 +++
 core/core-cli.el                    | 8 +++-----
 modules/lang/emacs-lisp/autoload.el | 2 ++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/core-cli-lib.el b/core/core-cli-lib.el
index 0ba1f217d..cb08bae7f 100644
--- a/core/core-cli-lib.el
+++ b/core/core-cli-lib.el
@@ -8,6 +8,9 @@
   (unless (or load-in-progress (not noninteractive))
     (require 'core-cli)))
 
+(require 'seq)
+(require 'map)
+
 
 ;;
 ;;; Variables
diff --git a/core/core-cli.el b/core/core-cli.el
index 40e88b25e..22947b2d2 100644
--- a/core/core-cli.el
+++ b/core/core-cli.el
@@ -59,8 +59,6 @@
 
 ;; Just the... bear necessities~
 (require 'core (expand-file-name "core" (file-name-directory load-file-name)))
-(require 'seq)
-(require 'map)
 
 ;; Load these eagerly, since autoloads haven't been generated/loaded yet
 (load! "autoload/process")
@@ -75,6 +73,9 @@
 (require 'core-modules)
 (require 'core-packages)
 
+;; Our DSL, API, and everything nice.
+(require 'core-cli-lib)
+
 ;; Don't generate superfluous files when writing temp buffers.
 (setq make-backup-files nil)
 ;; Stop user configuration from interfering with package management.
@@ -88,9 +89,6 @@
 ;;
 ;;; Bootstrap
 
-;; Our DSL, API, and everything nice.
-(require 'core-cli-lib)
-
 ;; Use our own home-grown debugger so we can capture backtraces, make them more
 ;; presentable, and write them to a file. Cleaner backtraces are better UX than
 ;; the giant wall of text the default debugger throws up.
diff --git a/modules/lang/emacs-lisp/autoload.el b/modules/lang/emacs-lisp/autoload.el
index bec940661..0b9370fff 100644
--- a/modules/lang/emacs-lisp/autoload.el
+++ b/modules/lang/emacs-lisp/autoload.el
@@ -261,6 +261,8 @@ verbosity when editing a file in `doom-private-dir' or `doom-emacs-dir'."
                   `(progn
                      (setq doom-modules ',doom-modules
                            doom-disabled-packages ',doom-disabled-packages)
+                     (require 'core)
+                     (require 'core-cli-lib)
                      (ignore-errors (load ,user-init-file t t))
                      (setq byte-compile-warnings
                            '(obsolete cl-functions