(make-autoload): Generate custom-autoload for autoloaded defcustoms.

1 files changed, 6 insertions, 11 deletions

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 8f479416c9..e37acb1b30 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -108,21 +108,16 @@ or macro definition or a defcustom)."
 		  (eq (car-safe (car body)) 'interactive))
 	      (if macrop (list 'quote 'macro) nil))))
 
-     ;; Convert defcustom to a simpler (and less space-consuming) defvar,
-     ;; but add some extra stuff if it uses :require.
+     ;; Convert defcustom to less space-consuming data.
      ((eq car 'defcustom)
       (let ((varname (car-safe (cdr-safe form)))
 	    (init (car-safe (cdr-safe (cdr-safe form))))
 	    (doc (car-safe (cdr-safe (cdr-safe (cdr-safe form)))))
-	    (rest (cdr-safe (cdr-safe (cdr-safe (cdr-safe form))))))
-	(if (not (plist-get rest :require))
-	    `(defvar ,varname ,init ,doc)
-	  `(progn
-	     (defvar ,varname ,init ,doc)
-	     (custom-add-to-group ,(plist-get rest :group)
-				  ',varname 'custom-variable)
-	     (custom-add-load ',varname
-			      ,(plist-get rest :require))))))
+	    ;; (rest (cdr-safe (cdr-safe (cdr-safe (cdr-safe form)))))
+	    )
+	`(progn
+	   (defvar ,varname ,init ,doc)
+	   (custom-autoload ',varname ,file))))
 
      ;; nil here indicates that this is not a special autoload form.
      (t nil))))