From ab20f385a7bae0c2938e50545c1045378a3e0575 Mon Sep 17 00:00:00 2001 From: Gong Qijian Date: Tue, 18 May 2021 16:35:48 +0200 Subject: [PATCH] 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 bb25c1b7b0b..2ba5d745540 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. -- 2.39.5