(enriched-face-ans): Use face-attribute instead

of face-foreground and face-background.

2 files changed, 13 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7da2c7fe37f..b0df672d4f1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,16 @@
 2000-11-29  Gerd Moellmann  <gerd@gnu.org>
 
+        * toolbar/tool-bar.el (tool-bar-add-item-from-menu): Use
+        face-attribute instead of face-foreground and face-background.
+        (tool-bar-add-item): Likewise, and handle unspecified colors.
+
+        * enriched.el (enriched-face-ans): Use face-attribute instead
+        of face-foreground and face-background.
+
+        * faces.el (face-foreground, face-background, face-stipple):
+        Return nil if attribute is unspecified, for backward
+        compatibility.
+
         * files.el (auto-mode-alist): Add an entry for antlr-mode.
 
         * play/5x5.el: Remove version info.
diff --git a/lisp/enriched.el b/lisp/enriched.el
index 804048b6173..8f4bf4f0392 100644
--- a/lisp/enriched.el
+++ b/lisp/enriched.el
@@ -356,8 +356,8 @@ One annotation each for foreground color, background color, italic, etc."
          (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-foreground face))
-                (bg (face-background face))
+        ((let* ((fg (face-attribute face :foreground))
+                (bg (face-attribute face :background))
                 (props (face-font face t))
                 (ans (cdr (format-annotate-single-property-change
                            'face nil props enriched-translations))))