From 58376670d83682e2135175dccf05a23eb815bfe6 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 15 Apr 2015 13:02:15 -0400 Subject: [PATCH] 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. --- lisp/cus-start.el | 6 +++++- lisp/loadup.el | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 05135b80e8e..29ef371669c 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -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. diff --git a/lisp/loadup.el b/lisp/loadup.el index 51339253ddd..bfec75fc2c9 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -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 -- 2.39.5