Recompute user-emacs-directory-relative defcustoms one more time

* lisp/startup.el (command-line): Re-evaluate the
custom-delayed predefined variables one more time after
loading the user's init file.  (Bug#37116)

1 files changed, 10 insertions, 2 deletions

diff --git a/lisp/startup.el b/lisp/startup.el
index 564428580b1..ff90646d7ae 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -406,6 +406,7 @@ if you have not already set `auto-save-list-file-name' yourself.
 Directories in the prefix will be created if necessary.
 Set this to nil if you want to prevent `auto-save-list-file-name'
 from being initialized."
+  :initialize 'custom-initialize-delay
   :type '(choice (const :tag "Don't record a session's auto save list" nil)
 		 string)
   :group 'auto-save)
@@ -1282,8 +1283,7 @@ please check its value")
   ;; depends on the runtime context, in case some of them depend on
   ;; the window-system features.  Example: blink-cursor-mode.
   (let (current-load-list) ; c-r-s may call defvar, and hence LOADHIST_ATTACH
-    (mapc 'custom-reevaluate-setting custom-delayed-init-variables)
-    (setq custom-delayed-init-variables nil))
+    (mapc 'custom-reevaluate-setting custom-delayed-init-variables))
 
   (normal-erase-is-backspace-setup-frame)
 
@@ -1377,6 +1377,14 @@ please check its value")
 		 (eq face-ignored-fonts old-face-ignored-fonts))
       (clear-face-cache)))
 
+  ;; Re-evaluate again the predefined variables whose initial value
+  ;; depends on the runtime context, in case the user init file
+  ;; modified user-emacs-directory.  Examples: abbrev-file-name,
+  ;; auto-save-list-file-prefix.
+  (let (current-load-list) ; c-r-s may call defvar, and hence LOADHIST_ATTACH
+    (mapc 'custom-reevaluate-setting custom-delayed-init-variables)
+    (setq custom-delayed-init-variables nil))
+
   (setq after-init-time (current-time))
   ;; Display any accumulated warnings after all functions in
   ;; `after-init-hook' like `desktop-read' have finalized possible