[Emacs-diffs] emacs-26 f4e6b6e: Small startup fix for current-load-list

[Glenn Morris]

branch: emacs-26
commit f4e6b6e0771b03855b0772bcbd55a22e8cdda2fe
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Small startup fix for current-load-list
    
    * lisp/startup.el (command-line):
    Avoid current-load-list being non-nil after startup ends.
---
 lisp/startup.el | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lisp/startup.el b/lisp/startup.el
index 6001dc9..9d16b59 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1090,11 +1090,12 @@ please check its value")
 
   ;; Re-evaluate predefined variables whose initial value depends on
   ;; the runtime context.
-  (mapc 'custom-reevaluate-setting
-        ;; Initialize them in the same order they were loaded, in case there
-        ;; are dependencies between them.
-        (prog1 (nreverse custom-delayed-init-variables)
-          (setq custom-delayed-init-variables nil)))
+  (let (current-load-list) ; c-r-s may call defvar, and hence LOADHIST_ATTACH
+    (mapc 'custom-reevaluate-setting
+          ;; Initialize them in the same order they were loaded, in case there
+          ;; are dependencies between them.
+          (prog1 (nreverse custom-delayed-init-variables)
+            (setq custom-delayed-init-variables nil))))
 
   (normal-erase-is-backspace-setup-frame)