aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2025-06-24 18:16:04 -0400
committerStefan Monnier2025-06-24 18:24:28 -0400
commit189ae7b1ed1a243db815560fffa71e9b8771ecb4 (patch)
tree550725394caaf5c80236b08fc01d896ba79c7723
parentb687f02a734ffd965cba3b140805f4c2c82358e6 (diff)
downloademacs-189ae7b1ed1a243db815560fffa71e9b8771ecb4.tar.gz
emacs-189ae7b1ed1a243db815560fffa71e9b8771ecb4.zip
cus-start.el: Fix bug#78637
* lisp/cus-start.el <toplevel>: Test `dump-mode` rather than `after-init-time` for `custom-delayed-init-variables`.
-rw-r--r--lisp/cus-start.el19
1 files changed, 9 insertions, 10 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 09364b68e11..7e07e055015 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -946,19 +946,18 @@ since it could result in memory overflow and make Emacs crash."
946 (put symbol 'custom-set (cadr prop))) 946 (put symbol 'custom-set (cadr prop)))
947 ;; This is used by describe-variable. 947 ;; This is used by describe-variable.
948 (if version (put symbol 'custom-version version)) 948 (if version (put symbol 'custom-version version))
949 ;; Don't re-add to custom-delayed-init-variables post-startup.
950 (unless after-init-time
951 ;; Note this is the _only_ initialize property we handle.
952 (if (eq (cadr (memq :initialize rest)) #'custom-initialize-delay)
953 ;; These vars are defined early and should hence be initialized
954 ;; early, even if this file happens to be loaded late. so add them
955 ;; to the end of custom-delayed-init-variables. Otherwise,
956 ;; auto-save-file-name-transforms will appear in customize-rogue.
957 (add-to-list 'custom-delayed-init-variables symbol 'append)))
958 ;; If this is NOT while dumping Emacs, set up the rest of the 949 ;; If this is NOT while dumping Emacs, set up the rest of the
959 ;; customization info. This is the stuff that is not needed 950 ;; customization info. This is the stuff that is not needed
960 ;; until someone does M-x customize etc. 951 ;; until someone does M-x customize etc.
961 (unless dump-mode 952 (if dump-mode
953 ;; Don't re-add to custom-delayed-init-variables post-startup.
954 ;; Note this is the _only_ initialize property we handle.
955 (if (eq (cadr (memq :initialize rest)) #'custom-initialize-delay)
956 ;; These vars are defined early and should hence be initialized
957 ;; early, even if this file happens to be loaded late. so add
958 ;; them to the end of custom-delayed-init-variables. Otherwise,
959 ;; auto-save-file-name-transforms will appear in customize-rogue.
960 (add-to-list 'custom-delayed-init-variables symbol 'append))
962 ;; Add it to the right group(s). 961 ;; Add it to the right group(s).
963 (if (listp group) 962 (if (listp group)
964 (dolist (g group) 963 (dolist (g group)