From 7c968a8b1103c4892bda48e9246c9a6d0ecdcde2 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 30 Dec 2019 23:19:56 -0500
Subject: [PATCH] Fix #2278: autoload gen skipping disabled autodefs

If a ;;;###if module cookie returned nil for a file, it should still
allow autodefs to be scraped from it, which wasn't happening before this
fix.

An autodef's guarantee is that it will always be defined, whether or not
the containing module is enabled.
---
 core/cli/autoloads.el | 50 +++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/core/cli/autoloads.el b/core/cli/autoloads.el
index e7921261f..196118879 100644
--- a/core/cli/autoloads.el
+++ b/core/cli/autoloads.el
@@ -190,31 +190,31 @@ it is nil, it will try to reload both."
               (module-enabled-p (print form)))))))
 
 (defun doom-cli--generate-autoloads-buffer (file)
-  (when (doom-file-cookie-p file "if" t)
-    (let* (;; Prevent `autoload-find-file' from firing file hooks, e.g. adding
-           ;; to recentf.
-           find-file-hook
-           write-file-functions
-           ;; Prevent a possible source of crashes when there's a syntax error
-           ;; in the autoloads file
-           debug-on-error
-           ;; The following bindings are in `package-generate-autoloads'.
-           ;; Presumably for a good reason, so I just copied them
-           (backup-inhibited t)
-           (version-control 'never)
-           case-fold-search    ; reduce magic
-           autoload-timestamps ; reduce noise in generated files
-           ;; Needed for `autoload-generate-file-autoloads'
-           (generated-autoload-load-name (file-name-sans-extension file))
-           (target-buffer (current-buffer))
-           (module (doom-module-from-path file))
-           (module-enabled-p (or (memq (car module) '(:core :private))
-                                 (doom-module-p (car module) (cdr module)))))
-      (save-excursion
-        (when module-enabled-p
-          (quiet! (autoload-generate-file-autoloads file target-buffer)))
-        (doom-cli--generate-autoloads-autodefs
-         file target-buffer module module-enabled-p)))))
+  (let* (;; Prevent `autoload-find-file' from firing file hooks, e.g. adding
+         ;; to recentf.
+         find-file-hook
+         write-file-functions
+         ;; Prevent a possible source of crashes when there's a syntax error
+         ;; in the autoloads file
+         debug-on-error
+         ;; The following bindings are in `package-generate-autoloads'.
+         ;; Presumably for a good reason, so I just copied them
+         (backup-inhibited t)
+         (version-control 'never)
+         case-fold-search    ; reduce magic
+         autoload-timestamps ; reduce noise in generated files
+         ;; Needed for `autoload-generate-file-autoloads'
+         (generated-autoload-load-name (file-name-sans-extension file))
+         (target-buffer (current-buffer))
+         (module (doom-module-from-path file))
+         (module-enabled-p (and (or (memq (car module) '(:core :private))
+                                    (doom-module-p (car module) (cdr module)))
+                                (doom-file-cookie-p file "if" t))))
+    (save-excursion
+      (when module-enabled-p
+        (quiet! (autoload-generate-file-autoloads file target-buffer)))
+      (doom-cli--generate-autoloads-autodefs
+       file target-buffer module module-enabled-p))))
 
 (defun doom-cli--generate-autoloads (files &optional scan)
   (require 'autoload)