diff options
Diffstat (limited to 'lisp/emacs-lisp/autoload.el')
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 76699f10df8..4000b4da282 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -124,17 +124,7 @@ or macro definition or a defcustom)." ) `(progn (defvar ,varname ,init ,doc) - (custom-autoload ',varname ,file) - ;; The use of :require in a defcustom can be annoying, especially - ;; when defcustoms are moved from one file to another between - ;; releases because the :require arg gets placed in the user's - ;; .emacs. In order for autoloaded minor modes not to need the - ;; use of :require, we arrange to store their :setter. - ,(let ((setter (condition-case nil - (cadr (memq :set form)) - (error nil)))) - (if (equal setter ''custom-set-minor-mode) - `(put ',varname 'custom-set 'custom-set-minor-mode)))))) + (custom-autoload ',varname ,file)))) ((eq car 'defgroup) ;; In Emacs this is normally handled separately by cus-dep.el, but for |