diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-04-15 13:02:15 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-04-15 13:02:15 -0400 |
| commit | 58376670d83682e2135175dccf05a23eb815bfe6 (patch) | |
| tree | fcba04f4cb5b8202d50e42818be1db5171799e44 /lisp/loadup.el | |
| parent | d338998775330f59a7e6dfef7705b605d2c99033 (diff) | |
| download | emacs-58376670d83682e2135175dccf05a23eb815bfe6.tar.gz | |
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.
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 4 |
1 files changed, 1 insertions, 3 deletions
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 |