Index: emacs/lisp/emacs-lisp/autoload.el
diff -c emacs/lisp/emacs-lisp/autoload.el:1.104
emacs/lisp/emacs-lisp/autoload.el:1.105
*** emacs/lisp/emacs-lisp/autoload.el:1.104 Thu Mar 31 21:17:40 2005
--- emacs/lisp/emacs-lisp/autoload.el Sun Jun 26 18:18:04 2005
***************
*** 1,7 ****
;; autoload.el --- maintain autoloads in loaddefs.el
! ;; Copyright (C) 1991,92,93,94,95,96,97, 2001,02,03,04
! ;; Free Software Foundation, Inc.
;; Author: Roland McGrath <[EMAIL PROTECTED]>
;; Keywords: maint
--- 1,7 ----
;; autoload.el --- maintain autoloads in loaddefs.el
! ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003,
! ;; 2004, 2005 Free Software Foundation, Inc.
;; Author: Roland McGrath <[EMAIL PROTECTED]>
;; Keywords: maint
***************
*** 123,129 ****
)
`(progn
(defvar ,varname ,init ,doc)
! (custom-autoload ',varname ,file))))
;; nil here indicates that this is not a special autoload form.
(t nil))))
--- 123,139 ----
)
`(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))))))
;; nil here indicates that this is not a special autoload form.
(t nil))))
***************
*** 566,570 ****
(provide 'autoload)
! ;;; arch-tag: 00244766-98f4-4767-bf42-8a22103441c6
;;; autoload.el ends here
--- 576,580 ----
(provide 'autoload)
! ;; arch-tag: 00244766-98f4-4767-bf42-8a22103441c6
;;; autoload.el ends here
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
