Mercurial > hg > xemacs-beta
comparison lisp/x-faces.el @ 298:70ad99077275 r21-0b47
Import from CVS: tag r21-0b47
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 10:39:40 +0200 |
| parents | e11d67e05968 |
| children | 54f7aa390f4f |
comparison
equal
deleted
inserted
replaced
| 297:deca3c1083ac | 298:70ad99077275 |
|---|---|
| 471 ;; If this is the default face, then any unspecified properties should | 471 ;; If this is the default face, then any unspecified properties should |
| 472 ;; be defaulted from the global properties. Can't do this for | 472 ;; be defaulted from the global properties. Can't do this for |
| 473 ;; frames or devices because then, common resource specs like | 473 ;; frames or devices because then, common resource specs like |
| 474 ;; "*Foreground: black" will have unwanted effects. | 474 ;; "*Foreground: black" will have unwanted effects. |
| 475 ;; | 475 ;; |
| 476 (if (and (eq (face-name face) 'default) | 476 (if (and (or (eq (face-name face) 'default) |
| 477 (eq (face-name face) 'gui-element)) | |
| 477 (or (null locale) (eq locale 'global))) | 478 (or (null locale) (eq locale 'global))) |
| 478 (progn | 479 (progn |
| 479 (or fn (setq fn (x-get-resource | 480 (or fn (setq fn (x-get-resource |
| 480 "font" "Font" 'string locale))) | 481 "font" "Font" 'string locale))) |
| 481 (or fg (setq fg (x-get-resource | 482 (or fg (setq fg (x-get-resource |