diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-09-13 00:52:55 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-09-13 00:52:55 +0000 |
| commit | adba8116c3a918f2f091600b60ea1700c9ea7362 (patch) | |
| tree | d687c036e1a97206c146b60f7d210b6802198b30 /lisp/epa-hook.el | |
| parent | afdceaec7decebe70be60baf5c6515ec3e7d6b1a (diff) | |
| download | emacs-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/epa-hook.el')
| -rw-r--r-- | lisp/epa-hook.el | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/epa-hook.el b/lisp/epa-hook.el index 593b5dcf150..0987b2a221d 100644 --- a/lisp/epa-hook.el +++ b/lisp/epa-hook.el @@ -86,6 +86,11 @@ May either be a string or a list of strings.") With prefix argument ARG, turn auto encryption on if positive, else off. Return the new status of auto encryption (non-nil means on)." :global t :init-value t :group 'epa-file :version "23.1" + ;; We'd like to use custom-initialize-set here so the setup is done + ;; before dumping, but at the point where the defcustom is evaluated, + ;; the corresponding function isn't defined yet, so + ;; custom-initialize-set signals an error. + :initialize 'custom-initialize-delay (setq file-name-handler-alist (delq epa-file-handler file-name-handler-alist)) (remove-hook 'find-file-hooks 'epa-file-find-file-hook) |