(facemenu-active-faces):

Use face-attributes-as-vector, not face-attributes-vector.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6befeb0670f71fc294ce1e3615275bedaeec7727..688afb62bdb1c31d379dc1dd9b1e65e9cf85e488 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-02  Richard M. Stallman  <rms@gnu.org>
+
+       * facemenu.el (facemenu-active-faces):
+       Use face-attributes-as-vector, not face-attributes-vector.
+
 2002-01-02  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * bindings.el (function-key-map): Don't bind shifted keypad

diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 6ad61585f97c46762c47876c2d444d735176d7b1..c138e13794c12798fc59d0b18cd5a00851ade2cb 100644 (file)
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -611,7 +611,7 @@ If the optional argument FRAME is given, use the faces in that frame; otherwise
 use the selected frame.  If t, then the global, non-frame faces are used."
   (let* ((mask-atts (copy-sequence
                     (if (consp (car face-list))
-                        (face-attribute-vector (car face-list))
+                        (face-attributes-as-vector (car face-list))
                       (or (internal-lisp-face-p (car face-list) frame)
                           (check-face (car face-list))))))
         (active-list (list (car face-list)))
@@ -620,7 +620,7 @@ use the selected frame.  If t, then the global, non-frame faces are used."
     (while face-list
       (if (let ((face-atts
                 (if (consp (car face-list))
-                    (face-attribute-vector (car face-list))
+                    (face-attributes-as-vector (car face-list))
                   (or (internal-lisp-face-p (car face-list) frame)
                       (check-face (car face-list)))))
                (i mask-len)