From: Glenn Morris <rgm@gnu.org>
Date: Wed, 17 Jan 2018 01:55:20 +0000 (-0500)
Subject: Small startup fix for current-load-list
X-Git-Tag: emacs-26.1-rc1~360
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f4e6b6e;p=emacs.git

Small startup fix for current-load-list

* lisp/startup.el (command-line):
Avoid current-load-list being non-nil after startup ends.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index 6001dc9a07b..9d16b59defd 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)