mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

cus-start.el: Reliably distinguish preload from nonpreload

Browse source 
`dump-mode` can be nil even if we're about to dump (this is
done in the Android build), so don't rely on it to distinguish
if `cus-start` is loaded from `loadup.el` vs loaded during
a "normal run".

* lisp/loadup.el (cus-start): Bind `cus-start--preload`.
* lisp/cus-start.el: <top-level>: Test it rather than `dump-mode`.
This commit is contained in:
Stefan Monnier 2025-06-27 22:55:04 -04:00
parent a132ca9a54
commit cb484ead91
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/cus-start.el
View file

@ -946,11 +946,10 @@ since it could result in memory overflow and make Emacs crash."
(put symbol 'custom-set (cadr prop)))
;; This is used by describe-variable.
(if version (put symbol 'custom-version version))
;; If this is NOT while dumping Emacs, set up the rest of the
;; customization info. This is the stuff that is not needed
;; until someone does M-x customize etc.
(if (or dump-mode (and (featurep 'android) (not after-init-time)))
;; Don't re-add to custom-delayed-init-variables post-startup.
;; `cus-start' can be loaded twice: it's preloaded by `loadup.el'
;; (at which point we don't set up all the info) but can be *re*loaded
;; later on demand by `custom' (and `info-xref') to get the full info.
(if (bound-and-true-p cus-start--preload)
;; Note this is the _only_ initialize property we handle.
(if (eq (cadr (memq :initialize rest)) #'custom-initialize-delay)
;; These vars are defined early and should hence be initialized
@ -958,6 +957,8 @@ since it could result in memory overflow and make Emacs crash."
;; them to the end of custom-delayed-init-variables. Otherwise,
;; auto-save-file-name-transforms will appear in customize-rogue.
(add-to-list 'custom-delayed-init-variables symbol 'append))
;; We're not preloading, so set up the rest of the customization info.
;; This is the stuff that is not needed until M-x customize etc.
;; Add it to the right group(s).
(if (listp group)
(dolist (g group)

3
lisp/loadup.el
View file

@ -392,7 +392,8 @@
(compiled-function-p (symbol-function 'macroexpand-all)))
(setq internal-make-interpreted-closure-function
#'cconv-make-interpreted-closure))
(load "cus-start") ;Late to reduce customize-rogue (needs loaddefs.el anyway)
(dlet ((cus-start--preload t)) ;; Tell `cus-start' we're preloading.
(load "cus-start")) ;Late to reduce customize-rogue (needs loaddefs.el anyway)
(load "tooltip")
(load "international/iso-transl") ; Binds Alt-[ and friends.