# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1161168660 0
# Node ID fb5c7e2b2689a3eeefd4240906bbe784db4f8ddb
# Parent  450378d395360605ce17a99d3ae2acc6fc2282df
(facemenu-add-new-face): Defend against symbol that isn't a face name.

diff -r 450378d39536 -r fb5c7e2b2689 lisp/facemenu.el
--- a/lisp/facemenu.el	Wed Oct 18 10:50:28 2006 +0000
+++ b/lisp/facemenu.el	Wed Oct 18 10:51:00 2006 +0000
@@ -690,6 +690,9 @@
     (cond ((facemenu-iterate ; check if equivalent face is already in the menu
 	    (lambda (m) (and (listp m)
 			     (symbolp (car m))
+			     ;; Avoid error in face-equal
+			     ;; when a non-face is erroneously present.
+			     (facep (car m))
 			     (face-equal (car m) symbol)))
 	    (cdr (symbol-function menu))))
 	  ;; Faces with a keyboard equivalent.  These go at the front.