From: Kenichi Handa <handa@m17n.org>
Date: Fri, 13 Jun 2008 02:04:37 +0000 (+0000)
Subject: (set-face-attribute): Fix previous change.
X-Git-Tag: emacs-pretest-23.0.90~4840
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e4fe6f9f213df355e8a7360388a650454ac8ffc6;p=emacs.git

(set-face-attribute): Fix previous change.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index 2bd1ffcfc8d..f3e88686196 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -706,6 +706,7 @@ like an underlying face would be, with higher priority than underlying faces."
       ;; when we update the frame's font param fro the attributes.
       (let ((inhibit-face-set-after-frame-default t))
 	(if (and (eq (car args) :family)
+		 (stringp (cadr args))
 		 (string-match "\\([^-]*\\)-\\([^-]*\\)" (cadr args)))
 	    (let ((foundry (match-string 1 (cadr args)))
 		  (family (match-string 2 (cadr args))))