From: Luc Teirlinck <teirllm@auburn.edu>
Date: Sat, 4 Sep 2004 19:13:40 +0000 (+0000)
Subject: (facemenu-active-faces): Change condition of inner `while' loop to
X-Git-Tag: ttn-vms-21-2-B4~5061
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=240c0c90e557cd161e22f1255b580076ee5d4d93;p=emacs.git

(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 e5ba5f23c03..f3ccc6f6099 100644
--- 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 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."
 		       (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))))