From b808c4e1ab406b99dd927f703a1b11e2f380e8b0 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 7 Aug 2019 16:55:04 -0400 Subject: [PATCH] Reload autoloads files in noninteractive sessions After it's been regenerated, so that any hacks (*cough*org/magit*cough*) are in scope. --- core/cli/autoloads.el | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/cli/autoloads.el b/core/cli/autoloads.el index 6fefc264f..b28fed6c1 100644 --- a/core/cli/autoloads.el +++ b/core/cli/autoloads.el @@ -57,10 +57,9 @@ It also caches `load-path', `Info-directory-list', `doom-disabled-packages', (byte-compile-dynamic-docstrings t)) (condition-case-unless-debug e (when (byte-compile-file file) - (if noninteractive - (add-hook 'doom-cli-post-success-execute-hook #'doom--warn-refresh-session-h) - ;; Give autoloads file a chance to report error - (load file 'noerror 'nomessage))) + (prog1 (load file 'noerror 'nomessage) + (when noninteractive + (add-hook 'doom-cli-post-success-execute-hook #'doom--warn-refresh-session-h)))) ((debug error) (let ((backup-file (concat file ".bk"))) (print! (warn "Copied backup to %s") (relpath backup-file))