Show
Ignore:
Timestamp:
2005年11月26日 08時33分26秒 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • vendor/emacs-CVS_HEAD/lisp/custom.el

    r3939 r3988  
    211211        references some other documentation. 
    212212 
    213         There are three alternatives you can use for LINK-DATA: 
     213        There are several alternatives you can use for LINK-DATA: 
    214214 
    215215        (custom-manual INFO-NODE) 
    216216             Link to an Info node; INFO-NODE is a string which specifies 
    217              the node name, as in \"(emacs)Top\".  The link appears as 
    218              `[manual]' in the customization buffer. 
     217             the node name, as in \"(emacs)Top\". 
    219218 
    220219        (info-link INFO-NODE) 
    …… 
    224223        (url-link URL) 
    225224             Link to a web page; URL is a string which specifies the URL. 
    226              The link appears in the customization buffer as URL. 
     225 
     226        (emacs-commentary-link LIBRARY) 
     227             Link to the commentary section of LIBRARY. 
     228 
     229        (emacs-library-link LIBRARY) 
     230             Link to an Emacs Lisp LIBRARY file. 
     231 
     232        (file-link FILE) 
     233             Link to FILE. 
     234 
     235        (function-link FUNCTION) 
     236             Link to the documentation of FUNCTION. 
     237 
     238        (variable-link VARIABLE) 
     239             Link to the documentation of VARIABLE. 
     240 
     241        (custom-group-link GROUP) 
     242             Link to another customization GROUP. 
    227243 
    228244        You can specify the text to use in the customization buffer by 
    …… 
    421437Read the section about customization in the Emacs Lisp manual for more 
    422438information." 
     439  (declare (doc-string 3)) 
    423440  ;; It is better not to use backquote in this file, 
    424441  ;; because that makes a bootstrapping problem 
    …… 
    11041121  "Reenable all variable and face settings defined by THEME. 
    11051122The newly enabled theme gets the highest precedence (after `user'). 
    1106 If it is already enabled, just give it highest precedence (after `user')." 
     1123If it is already enabled, just give it highest precedence (after `user'). 
     1124 
     1125This signals an error if THEME does not specify any theme 
     1126settings.  Theme settings are set using `load-theme'." 
    11071127  (interactive "SEnable Custom theme: ") 
    11081128  (let ((settings (get theme 'theme-settings))) 
     1129    (if (and (not (eq theme 'user)) (null settings)) 
     1130        (error "No theme settings defined in %s." (symbol-name theme))) 
    11091131    (dolist (s settings) 
    11101132      (let* ((prop (car s)) 
    …… 
    11141136        (if (eq prop 'theme-value) 
    11151137            (custom-theme-recalc-variable symbol) 
    1116           (custom-theme-recalc-face symbol))))) 
     1138          (if (facep symbol) 
     1139              (custom-theme-recalc-face symbol)))))) 
    11171140  (setq custom-enabled-themes 
    11181141        (cons theme (delq theme custom-enabled-themes)))