Commit 58376670 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

Fix recent cus-start changes that added customize-rogues

* lisp/cus-start.el (custom-delayed-init-variables): Initialize the
vars early.
* lisp/loadup.el ("cus-start"): Move to the end to reduce customize-rogue.
parent d3389987
......@@ -632,7 +632,11 @@ since it could result in memory overflow and make Emacs crash."
(put symbol 'custom-set (cadr prop)))
;; Note this is the _only_ initialize property we handle.
(if (eq (cadr (memq :initialize rest)) 'custom-initialize-delay)
(push symbol custom-delayed-init-variables))
;; These vars are defined early and should hence be initialized
;; early, even if this file happens to be loaded late. so add them
;; to the end of custom-delayed-init-variables. Otherwise,
;; auto-save-file-name-transforms will appear in M-x customize-rogue.
(add-to-list 'custom-delayed-init-variables symbol 'append))
;; 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.
......@@ -101,8 +101,6 @@
(load "env")
(load "format")
(load "bindings")
;; This sets temporary-file-directory, used by eg
;; auto-save-file-name-transforms in files.el.
(load "window") ; Needed here for `replace-buffer-in-windows'.
(setq load-source-file-function 'load-with-code-conversion)
(load "files")
......@@ -143,7 +141,6 @@
;; In case loaddefs hasn't been generated yet.
(file-error (load "ldefs-boot.el")))
(load "cus-start") ;After loaddefs to autoload pcase-dolist.
(load "emacs-lisp/nadvice")
(load "emacs-lisp/cl-preloaded")
(load "minibuffer") ;After loaddefs, for define-minor-mode.
......@@ -284,6 +281,7 @@
(load "uniquify")
(load "electric")
(load "emacs-lisp/eldoc")
(load "cus-start") ;Late to reduce customize-rogue (needs loaddefs.el anyway)
(if (not (eq system-type 'ms-dos)) (load "tooltip"))
;; This file doesn't exist when building a development version of Emacs
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment