aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Teirlinck2004-09-04 19:13:40 +0000
committerLuc Teirlinck2004-09-04 19:13:40 +0000
commit240c0c90e557cd161e22f1255b580076ee5d4d93 (patch)
treefd703a97f465188cefec770a29dfeda7cba76504
parent8e7344567875c6d08789b2437f31c9e931bf9d04 (diff)
downloademacs-240c0c90e557cd161e22f1255b580076ee5d4d93.tar.gz
emacs-240c0c90e557cd161e22f1255b580076ee5d4d93.zip
(facemenu-active-faces): Change condition of inner `while' loop to
also check the first two elements of `face-atts' and `mask-atts'.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/facemenu.el2
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e5ba5f23c03..f3ccc6f6099 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12004-09-04 Luc Teirlinck <teirllm@auburn.edu>
2
3 * facemenu.el (facemenu-active-faces): Change condition of inner
4 `while' loop to also check the first two elements of `face-atts'
5 and `mask-atts'.
6
12004-09-04 John Paul Wallington <jpw@gnu.org> 72004-09-04 John Paul Wallington <jpw@gnu.org>
2 8
3 * thumbs.el (thumbs-view-image-mode-map): Fix command name typo. 9 * thumbs.el (thumbs-view-image-mode-map): Fix command name typo.
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index e9af58fc73d..c6cce457fe6 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -617,7 +617,7 @@ use the selected frame. If t, then the global, non-frame faces are used."
617 (check-face (car face-list))))) 617 (check-face (car face-list)))))
618 (i mask-len) 618 (i mask-len)
619 (useful nil)) 619 (useful nil))
620 (while (> (setq i (1- i)) 1) 620 (while (>= (setq i (1- i)) 0)
621 (and (not (memq (aref face-atts i) '(nil unspecified))) 621 (and (not (memq (aref face-atts i) '(nil unspecified)))
622 (memq (aref mask-atts i) '(nil unspecified)) 622 (memq (aref mask-atts i) '(nil unspecified))
623 (aset mask-atts i (setq useful t)))) 623 (aset mask-atts i (setq useful t))))