summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/faces.el1
1 files changed, 1 insertions, 0 deletions
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))))