Mercurial > emacs
comparison lisp/startup.el @ 104961:0ea87b098bb0
* custom.el (custom-delayed-init-variables): New var.
(custom-initialize-delay): New function.
* startup.el (command-line): "Re"evaluate all vars in
custom-delayed-init-variables. Don't reevaluate abbrev-file-name
explicitly any more.
* abbrev.el (abbrev-file-name): Use custom-initialize-delay
to avoid creating a ~/.emacs.d at build-time (bug#4347).
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 11 Sep 2009 21:25:44 +0000 |
| parents | c603ee2aac17 |
| children | a4c2188bd87d |
comparison
equal
deleted
inserted
replaced
| 104960:ddca2477302b | 104961:0ea87b098bb0 |
|---|---|
| 701 | 701 |
| 702 ;; Choose a reasonable location for temporary files. | 702 ;; Choose a reasonable location for temporary files. |
| 703 (custom-reevaluate-setting 'temporary-file-directory) | 703 (custom-reevaluate-setting 'temporary-file-directory) |
| 704 (custom-reevaluate-setting 'small-temporary-file-directory) | 704 (custom-reevaluate-setting 'small-temporary-file-directory) |
| 705 (custom-reevaluate-setting 'auto-save-file-name-transforms) | 705 (custom-reevaluate-setting 'auto-save-file-name-transforms) |
| 706 (custom-reevaluate-setting 'abbrev-file-name) | |
| 707 ;; Force recomputation, in case it was computed during the dump. | 706 ;; Force recomputation, in case it was computed during the dump. |
| 708 (setq abbreviated-home-dir nil) | 707 (setq abbreviated-home-dir nil) |
| 709 | 708 |
| 710 ;; See if we should import version-control from the environment variable. | 709 ;; See if we should import version-control from the environment variable. |
| 711 (let ((vc (getenv "VERSION_CONTROL"))) | 710 (let ((vc (getenv "VERSION_CONTROL"))) |
| 907 ;; resources, set up the toolbar without enabling it. | 906 ;; resources, set up the toolbar without enabling it. |
| 908 (tool-bar-setup) | 907 (tool-bar-setup) |
| 909 ;; Otherwise, enable tool-bar-mode. | 908 ;; Otherwise, enable tool-bar-mode. |
| 910 (tool-bar-mode 1))) | 909 (tool-bar-mode 1))) |
| 911 | 910 |
| 911 ;; Re-evaluate predefined variables whose initial value depends on | |
| 912 ;; the runtime context. | |
| 913 (mapc 'custom-reevaluate-setting | |
| 914 ;; Initialize them in the same order they were loaded, in case there | |
| 915 ;; are dependencies between them. | |
| 916 (prog1 (nreverse custom-delayed-init-variables) | |
| 917 (setq custom-delayed-init-variables nil))) | |
| 918 | |
| 912 ;; Can't do this init in defcustom because the relevant variables | 919 ;; Can't do this init in defcustom because the relevant variables |
| 913 ;; are not set. | 920 ;; are not set. |
| 914 (custom-reevaluate-setting 'blink-cursor-mode) | 921 (custom-reevaluate-setting 'blink-cursor-mode) |
| 915 (custom-reevaluate-setting 'tooltip-mode) | 922 (custom-reevaluate-setting 'tooltip-mode) |
| 916 (custom-reevaluate-setting 'global-font-lock-mode) | 923 (custom-reevaluate-setting 'global-font-lock-mode) |