From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 18 Oct 2006 10:51:00 +0000 (+0000)
Subject: (facemenu-add-new-face): Defend against symbol that isn't a face name.
X-Git-Tag: emacs-pretest-22.0.90~88
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f3359de125a632540521967d2d5318ef68efba5e;p=emacs.git

(facemenu-add-new-face): Defend against symbol that isn't a face name.
---

diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index eaaf4dacd72..13cf7fbd734 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -690,6 +690,9 @@ This is called whenever you create a new face, and at other times."
     (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.