[Emacs-diffs] Changes to emacs/lisp/enriched.el

[Eli Zaretskii]

Index: emacs/lisp/enriched.el
diff -c emacs/lisp/enriched.el:1.39 emacs/lisp/enriched.el:1.40
*** emacs/lisp/enriched.el:1.39 Sun Jan  6 06:35:17 2002
--- emacs/lisp/enriched.el      Sun Mar 24 14:14:32 2002
***************
*** 341,346 ****
--- 341,350 ----
         (list (list "x-color" (cdr face))))
        ((and (consp face) (eq (car face) 'background-color))
         (list (list "x-bg-color" (cdr face))))
+       ((and (listp face) (eq (car face) :foreground))
+        (list (list "x-color" (cadr face))))
+       ((and (listp face) (eq (car face) :background))
+        (list (list "x-bg-color" (cadr face))))
        ((listp face)
         (apply 'append (mapcar 'enriched-face-ans face)))
        ((string-match "^fg:" (symbol-name face))
***************
*** 436,442 ****
      (cond ((null color)
           (message "Warning: no color specified for <x-color>"))
          ((facep face))
!         ((and (display-color-p) (facemenu-get-face face)))
          ((make-face face)
           (message "Warning: color `%s' can't be displayed" color)))
      (list from to 'face face)))
--- 440,447 ----
      (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)))
***************
*** 446,452 ****
      (cond ((null color)
           (message "Warning: no color specified for <x-bg-color>"))
          ((facep face))
!         ((and (display-color-p) (facemenu-get-face face)))
          ((make-face face)
           (message "Warning: color `%s' can't be displayed" color)))
      (list from to 'face face)))
--- 451,458 ----
      (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)))