Show
Ignore:
Timestamp:
2006年07月16日 08時36分52秒 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lisp/emacs-lisp/autoload.el

    r4098 r4111  
    125125        `(progn 
    126126           (defvar ,varname ,init ,doc) 
    127            (custom-autoload ',varname ,file) 
    128            ;; The use of :require in a defcustom can be annoying, especially 
    129            ;; when defcustoms are moved from one file to another between 
    130            ;; releases because the :require arg gets placed in the user's 
    131            ;; .emacs.  In order for autoloaded minor modes not to need the 
    132            ;; use of :require, we arrange to store their :setter. 
    133            ,(let ((setter (condition-case nil 
    134                               (cadr (memq :set form)) 
    135                             (error nil)))) 
    136               (if (equal setter ''custom-set-minor-mode) 
    137                   `(put ',varname 'custom-set 'custom-set-minor-mode)))))) 
     127           (custom-autoload ',varname ,file)))) 
    138128 
    139129     ((eq car 'defgroup)