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/faces.el

    r3939 r3988  
    375375      (let ((inh-from (face-attribute face :inherit frame))) 
    376376        (unless (or (null inh-from) (eq inh-from 'unspecified)) 
    377           (setq value 
    378                 (face-attribute-merged-with attribute value inh-from frame))))) 
     377          (condition-case nil 
     378              (setq value 
     379                    (face-attribute-merged-with attribute value inh-from frame)) 
     380            ;; The `inherit' attribute may point to non existent faces. 
     381            (error nil))))) 
    379382    (when (and inherit 
    380383               (not (eq inherit t)) 
    …… 
    558561 
    559562ARGS must come in pairs ATTRIBUTE VALUE.  ATTRIBUTE must be a valid 
    560 face attribute name. All attributes can be set to `unspecified'; 
     563face attribute name. All attributes can be set to `unspecified'; 
    561564this fact is not further mentioned below. 
    562565 
    …… 
    10171020                             name face default) 
    10181021                   (format "%s for face `%s': " name face)) 
    1019                  completion-alist))) 
     1022                 completion-alist nil nil nil nil default))) 
    10201023    (if (equal value "") default value))) 
    10211024 
    …… 
    14461449If SPEC is nil, do nothing." 
    14471450  (let ((attrs (face-spec-choose spec frame))) 
    1448     (when attrs 
     1451    (when spec 
    14491452      (face-spec-reset-face face frame)) 
    14501453    (while attrs