Show
Ignore:
Timestamp:
04/07/07 15:49:28 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/faces.el

    r4196 r4200  
    17901790          (progn 
    17911791            (face-spec-set face (face-user-default-spec face) frame) 
    1792             (internal-merge-in-global-face face frame) 
    17931792            (if (memq window-system '(x w32 mac)) 
    17941793                (make-face-x-resource-internal face frame)) 
    1795             ;; If the user has customized the face, don't let X 
    1796             ;; resources override the customizations. 
    1797             (if (get face 'theme-face) 
    1798                 (custom-theme-recalc-face face))) 
     1794            (internal-merge-in-global-face face frame)) 
    17991795        (error nil))) 
    18001796    ;; Apply the attributes specified by frame parameters.  This