From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 7 Feb 2010 04:14:26 +0000 (-0500)
Subject: Fix setting family and foundry in set-face-attribute (Bug#5536).
X-Git-Tag: emacs-pretest-23.1.93~94
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c917476d6b5069d8c81675bf7f661ee3ebceb84d;p=emacs.git

Fix setting family and foundry in set-face-attribute (Bug#5536).

* faces.el (set-face-attribute): Allow calling
internal-set-lisp-face-attribute with 'unspecified family and
foundry argument (Bug#5536).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ae3a55113dc..f754ca0b44d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-07  sj  <prime.wizard+emacs@gmail.com>  (tiny change)
+
+	* faces.el (set-face-attribute): Allow calling
+	internal-set-lisp-face-attribute with 'unspecified family and
+	foundry argument (Bug#5536).
+
 2010-02-07  Glenn Morris  <rgm@gnu.org>
 
 	* progmodes/f90.el (f90-font-lock-keywords-2)
diff --git a/lisp/faces.el b/lisp/faces.el
index 8edd2851b88..a5bc7b1c965 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -735,10 +735,10 @@ like an underlying face would be, with higher priority than underlying faces."
 	(unless foundry
 	  (setq foundry (match-string 1 family)))
 	(setq family (match-string 2 family)))
-      (when (stringp family)
+      (when (or (stringp family) (eq family 'unspecified))
 	(internal-set-lisp-face-attribute face :family (purecopy family)
 					  where))
-      (when (stringp foundry)
+      (when (or (stringp foundry) (eq foundry 'unspecified))
 	(internal-set-lisp-face-attribute face :foundry (purecopy foundry)
 					  where)))
     (while args