master ab20f38: Fix `custom-delayed-init-variables' problem when re-dumping emacs

[Lars Ingebrigtsen]

branch: master
commit ab20f385a7bae0c2938e50545c1045378a3e0575
Author: Gong Qijian <gongqijian@gmail.com>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Fix `custom-delayed-init-variables' problem when re-dumping emacs
    
    * lisp/startup.el (command-line): Don't bug out on redumping Emacs
    (bug#48492).
    
    Copyright-paperwork-exempt: yes
---
 lisp/startup.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/startup.el b/lisp/startup.el
index bb25c1b..2ba5d74 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1197,11 +1197,11 @@ please check its value")
 
   ;; Re-evaluate predefined variables whose initial value depends on
   ;; the runtime context.
-  (setq custom-delayed-init-variables
-        ;; Initialize them in the same order they were loaded, in case there
-        ;; are dependencies between them.
-        (nreverse custom-delayed-init-variables))
-  (mapc #'custom-reevaluate-setting custom-delayed-init-variables)
+  (when (listp custom-delayed-init-variables)
+    (mapc #'custom-reevaluate-setting
+          ;; Initialize them in the same order they were loaded, in
+          ;; case there are dependencies between them.
+          (reverse custom-delayed-init-variables)))
   (setq custom-delayed-init-variables t)
 
   ;; Warn for invalid user name.