(facemenu-active-faces): Change condition of inner `while' loop to

also check the first two elements of `face-atts' and `mask-atts'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e5ba5f23c03dc768b829adc19bec11eaa13a2a35..f3ccc6f60999360186803711eb4120d4ae27a469 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-04  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * facemenu.el (facemenu-active-faces): Change condition of inner
+       `while' loop to also check the first two elements of `face-atts'
+       and `mask-atts'.
+
 2004-09-04  John Paul Wallington  <jpw@gnu.org>
 
        * thumbs.el (thumbs-view-image-mode-map): Fix command name typo.

diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index e9af58fc73db9285ea44d2346b280d37d8196114..c6cce457fe6ae183c330e8e0dc69def19891f70e 100644 (file)
--- 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."
                       (check-face (car face-list)))))
                (i mask-len)
                (useful nil))
-           (while (> (setq i (1- i)) 1)
+           (while (>= (setq i (1- i)) 0)
              (and (not (memq (aref face-atts i) '(nil unspecified)))
                   (memq (aref mask-atts i) '(nil unspecified))
                   (aset mask-atts i (setq useful t))))