diff options
| author | Richard M. Stallman | 2002-01-02 22:56:12 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2002-01-02 22:56:12 +0000 |
| commit | f790dddf6d62e741a8b8a2757d45385256e00c67 (patch) | |
| tree | cc5ff92cbb46307c1829978256c1067f2c1f8b69 | |
| parent | edde72f6c6a14bf388d5005495793f9c3d60dbdf (diff) | |
| download | emacs-f790dddf6d62e741a8b8a2757d45385256e00c67.tar.gz emacs-f790dddf6d62e741a8b8a2757d45385256e00c67.zip | |
(facemenu-active-faces):
Use face-attributes-as-vector, not face-attributes-vector.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/facemenu.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6befeb0670f..688afb62bdb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2002-01-02 Richard M. Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * facemenu.el (facemenu-active-faces): | ||
| 4 | Use face-attributes-as-vector, not face-attributes-vector. | ||
| 5 | |||
| 1 | 2002-01-02 Eli Zaretskii <eliz@is.elta.co.il> | 6 | 2002-01-02 Eli Zaretskii <eliz@is.elta.co.il> |
| 2 | 7 | ||
| 3 | * bindings.el (function-key-map): Don't bind shifted keypad | 8 | * bindings.el (function-key-map): Don't bind shifted keypad |
diff --git a/lisp/facemenu.el b/lisp/facemenu.el index 6ad61585f97..c138e13794c 100644 --- 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 | |||
| 611 | use the selected frame. If t, then the global, non-frame faces are used." | 611 | use the selected frame. If t, then the global, non-frame faces are used." |
| 612 | (let* ((mask-atts (copy-sequence | 612 | (let* ((mask-atts (copy-sequence |
| 613 | (if (consp (car face-list)) | 613 | (if (consp (car face-list)) |
| 614 | (face-attribute-vector (car face-list)) | 614 | (face-attributes-as-vector (car face-list)) |
| 615 | (or (internal-lisp-face-p (car face-list) frame) | 615 | (or (internal-lisp-face-p (car face-list) frame) |
| 616 | (check-face (car face-list)))))) | 616 | (check-face (car face-list)))))) |
| 617 | (active-list (list (car face-list))) | 617 | (active-list (list (car face-list))) |
| @@ -620,7 +620,7 @@ use the selected frame. If t, then the global, non-frame faces are used." | |||
| 620 | (while face-list | 620 | (while face-list |
| 621 | (if (let ((face-atts | 621 | (if (let ((face-atts |
| 622 | (if (consp (car face-list)) | 622 | (if (consp (car face-list)) |
| 623 | (face-attribute-vector (car face-list)) | 623 | (face-attributes-as-vector (car face-list)) |
| 624 | (or (internal-lisp-face-p (car face-list) frame) | 624 | (or (internal-lisp-face-p (car face-list) frame) |
| 625 | (check-face (car face-list))))) | 625 | (check-face (car face-list))))) |
| 626 | (i mask-len) | 626 | (i mask-len) |