Mercurial > hg > xemacs-beta
comparison lisp/x-faces.el @ 410:de805c49cfc1 r21-2-35
Import from CVS: tag r21-2-35
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:19:21 +0200 |
parents | 74fd4e045ea6 |
children | 697ef44129c6 |
comparison
equal
deleted
inserted
replaced
409:301b9ebbdf3b | 410:de805c49cfc1 |
---|---|
490 (if (and (or (eq (face-name face) 'default) | 490 (if (and (or (eq (face-name face) 'default) |
491 (eq (face-name face) 'gui-element)) | 491 (eq (face-name face) 'gui-element)) |
492 (or (null locale) (eq locale 'global))) | 492 (or (null locale) (eq locale 'global))) |
493 (progn | 493 (progn |
494 (or fn (setq fn (x-get-resource | 494 (or fn (setq fn (x-get-resource |
495 "font" "Font" 'string locale))) | 495 "font" "Font" 'string locale nil 'warn))) |
496 (or fg (setq fg (x-get-resource | 496 (or fg (setq fg (x-get-resource |
497 "foreground" "Foreground" 'string locale))) | 497 "foreground" "Foreground" 'string locale nil |
498 'warn))) | |
498 (or bg (setq bg (x-get-resource | 499 (or bg (setq bg (x-get-resource |
499 "background" "Background" 'string locale))))) | 500 "background" "Background" 'string locale nil |
501 'warn))))) | |
500 ;; | 502 ;; |
501 ;; "*cursorColor: foo" is equivalent to setting the background of the | 503 ;; "*cursorColor: foo" is equivalent to setting the background of the |
502 ;; text-cursor face. | 504 ;; text-cursor face. |
503 ;; | 505 ;; |
504 (if (and (eq (face-name face) 'text-cursor) | 506 (if (and (eq (face-name face) 'text-cursor) |
505 (or (null locale) (eq locale 'global))) | 507 (or (null locale) (eq locale 'global))) |
506 (setq bg (or (x-get-resource | 508 (setq bg (or (x-get-resource |
507 "cursorColor" "CursorColor" 'string locale) bg))) | 509 "cursorColor" "CursorColor" 'string locale nil 'warn) |
510 bg))) | |
508 ;; #### should issue warnings? I think this should be | 511 ;; #### should issue warnings? I think this should be |
509 ;; done when the instancing actually happens, but I'm not | 512 ;; done when the instancing actually happens, but I'm not |
510 ;; sure how it should actually be dealt with. | 513 ;; sure how it should actually be dealt with. |
511 (when fn | 514 (when fn |
512 (if device-class | 515 (if device-class |
733 | 736 |
734 ;; | 737 ;; |
735 ;; If reverseVideo was specified, swap the foreground and background | 738 ;; If reverseVideo was specified, swap the foreground and background |
736 ;; of the default and modeline faces. | 739 ;; of the default and modeline faces. |
737 ;; | 740 ;; |
738 (cond ((car (x-get-resource "reverseVideo" "ReverseVideo" 'boolean frame)) | 741 (cond ((car (x-get-resource "reverseVideo" "ReverseVideo" 'boolean frame |
742 nil 'warn)) | |
739 ;; First make sure the modeline has fg and bg, inherited from the | 743 ;; First make sure the modeline has fg and bg, inherited from the |
740 ;; current default face - for the case where only one is specified, | 744 ;; current default face - for the case where only one is specified, |
741 ;; so that invert-face doesn't do something weird. | 745 ;; so that invert-face doesn't do something weird. |
742 (or (face-foreground 'modeline frame) | 746 (or (face-foreground 'modeline frame) |
743 (set-face-foreground 'modeline | 747 (set-face-foreground 'modeline |