Mercurial > emacs
changeset 44376:b5dd3758c750
(enriched-face-ans): Delete special treatment for fg:... and bg:... faces.
(enriched-decode-foreground): Return a list that specifies
the foreground color, rather than creating a face.
(enriched-decode-background): Likewise.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Wed, 03 Apr 2002 15:28:45 +0000 |
| parents | a00feef20f38 |
| children | 7c3b2b1a90ac |
| files | lisp/enriched.el |
| diffstat | 1 files changed, 12 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/enriched.el Wed Apr 03 15:23:59 2002 +0000 +++ b/lisp/enriched.el Wed Apr 03 15:28:45 2002 +0000 @@ -347,10 +347,6 @@ (list (list "x-bg-color" (cadr face)))) ((listp face) (apply 'append (mapcar 'enriched-face-ans face))) - ((string-match "^fg:" (symbol-name face)) - (list (list "x-color" (substring (symbol-name face) 3)))) - ((string-match "^bg:" (symbol-name face)) - (list (list "x-bg-color" (substring (symbol-name face) 3)))) ((let* ((fg (face-attribute face :foreground)) (bg (face-attribute face :background)) (props (face-font face t)) @@ -436,28 +432,20 @@ (delete-char 1))) (defun enriched-decode-foreground (from to &optional color) - (let ((face (intern (concat "fg:" color)))) - (cond ((null color) - (message "Warning: no color specified for <x-color>")) - ((facep face)) - ((and (display-color-p) (facemenu-get-face face)) - (set-face-foreground face color)) - ((make-face face) - (message "Warning: color `%s' can't be displayed" color))) - (list from to 'face face))) + (if (and color (display-color-p) (facemenu-get-face face)) + (list from to 'face (cons ':foreground color)) + (if (null color) + (message "Warning: no color specified for <x-color>") + (message "Warning: color `%s' can't be displayed" color)) + nil)) (defun enriched-decode-background (from to &optional color) - (let ((face (intern (concat "bg:" color)))) - (cond ((null color) - (message "Warning: no color specified for <x-bg-color>")) - ((facep face)) - ((and (display-color-p) (facemenu-get-face face)) - (set-face-background face color)) - ((make-face face) - (message "Warning: color `%s' can't be displayed" color))) - (list from to 'face face))) - - + (if (and color (display-color-p) (facemenu-get-face face)) + (list from to 'face (cons ':background color)) + (if (null color) + (message "Warning: no color specified for <x-bg-color>") + (message "Warning: color `%s' can't be displayed" color)) + nil)) ;;; Handling the `display' property.