summaryrefslogtreecommitdiff
path: root/lisp/startup.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2009-09-13 00:52:55 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2009-09-13 00:52:55 +0000
commitadba8116c3a918f2f091600b60ea1700c9ea7362 (patch)
treed687c036e1a97206c146b60f7d210b6802198b30 /lisp/startup.el
parentafdceaec7decebe70be60baf5c6515ec3e7d6b1a (diff)
downloademacs-adba8116c3a918f2f091600b60ea1700c9ea7362.tar.gz
* mail/sendmail.el (send-mail-function):
* tooltip.el (tooltip-mode): * simple.el (transient-mark-mode): * rfn-eshadow.el (file-name-shadow-mode): * frame.el (blink-cursor-mode): * font-core.el (global-font-lock-mode): * files.el (temporary-file-directory) (small-temporary-file-directory, auto-save-file-name-transforms): * epa-hook.el (auto-encryption-mode): * composite.el (global-auto-composition-mode): Use custom-initialize-delay. * startup.el (command-line): Don't explicitly call custom-reevaluate-setting for all the above vars. * custom.el (custom-initialize-safe-set) (custom-initialize-safe-default): Delete.
Diffstat (limited to 'lisp/startup.el')
-rw-r--r--lisp/startup.el16
1 files changed, 0 insertions, 16 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index d5133290ba8..14758727c02 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -698,10 +698,6 @@ opening the first frame (e.g. open a connection to an X server).")
after-init-time nil
command-line-default-directory default-directory)
- ;; Choose a reasonable location for temporary files.
- (custom-reevaluate-setting 'temporary-file-directory)
- (custom-reevaluate-setting 'small-temporary-file-directory)
- (custom-reevaluate-setting 'auto-save-file-name-transforms)
;; Force recomputation, in case it was computed during the dump.
(setq abbreviated-home-dir nil)
@@ -914,18 +910,6 @@ opening the first frame (e.g. open a connection to an X server).")
;; are dependencies between them.
(prog1 (nreverse custom-delayed-init-variables)
(setq custom-delayed-init-variables nil)))
-
- ;; Can't do this init in defcustom because the relevant variables
- ;; are not set.
- (custom-reevaluate-setting 'blink-cursor-mode)
- (custom-reevaluate-setting 'tooltip-mode)
- (custom-reevaluate-setting 'global-font-lock-mode)
- (custom-reevaluate-setting 'file-name-shadow-mode)
- (custom-reevaluate-setting 'send-mail-function)
- (custom-reevaluate-setting 'focus-follows-mouse)
- (custom-reevaluate-setting 'global-auto-composition-mode)
- (custom-reevaluate-setting 'transient-mark-mode)
- (custom-reevaluate-setting 'auto-encryption-mode)
(normal-erase-is-backspace-setup-frame)