# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1152814386 0
# Node ID e727167b07e4b2f18a7733fdb52c34d092113204
# Parent  0048306da39ef461dde43c7deefd080bbc0dfe9b
(make-autoload): Remove special handling of
minor modes, redundant with the custom-autoload line above.

diff -r 0048306da39e -r e727167b07e4 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Jul 13 14:45:10 2006 +0000
+++ b/lisp/ChangeLog	Thu Jul 13 18:13:06 2006 +0000
@@ -1,7 +1,11 @@
+2006-07-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/autoload.el (make-autoload): Remove special handling of
+	minor modes, redundant with the custom-autoload line above.
+
 2006-07-12  Chong Yidong  <cyd@stupidchicken.com>
 
-	* longlines.el (longlines-post-command-function): Handle open-line
-	too.
+	* longlines.el (longlines-post-command-function): Handle open-line too.
 
 2006-07-12  Richard Stallman  <rms@gnu.org>
 
@@ -55,8 +59,8 @@
 	(vc-print-log): Run log-view-mode in process sentinel inside
 	inhibit-read-only.  Don't shrink window due to timing issues.
 
-	* progmodes/ebrowse.el (ebrowse-display-member-buffer): Avoid
-	using with-output-to-temp-buffer, which clobbers local vars.
+	* progmodes/ebrowse.el (ebrowse-display-member-buffer):
+	Avoid using with-output-to-temp-buffer, which clobbers local vars.
 
 2006-07-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff -r 0048306da39e -r e727167b07e4 lisp/emacs-lisp/autoload.el
--- a/lisp/emacs-lisp/autoload.el	Thu Jul 13 14:45:10 2006 +0000
+++ b/lisp/emacs-lisp/autoload.el	Thu Jul 13 18:13:06 2006 +0000
@@ -124,17 +124,7 @@
 	    )
 	`(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