(set-face-attribute): Fix handling of :family "FOUNDRY-FAMILY".

2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bef81745c1b..1ce5defa545 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-19  Kenichi Handa  <handa@m17n.org>
+
+        * faces.el (set-face-attribute): Fix handling of :family
+        "FOUNDRY-FAMILY".
+
 2009-05-18  Chong Yidong  <cyd@stupidchicken.com>
 
         * register.el (register-alist): Doc fix (Bug#3311).
diff --git a/lisp/faces.el b/lisp/faces.el
index 778a363b170..57d6bd7dcb3 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -725,8 +725,8 @@ like an underlying face would be, with higher priority than underlying faces."
       (when (and (stringp family)
                  (string-match "\\([^-]*\\)-\\([^-]*\\)" family))
         (unless foundry
-          (setq foundry (match-string 2 family)))
-        (setq family (match-string 1 family)))
+          (setq foundry (match-string 1 family)))
+        (setq family (match-string 2 family)))
       (when (stringp family)
         (internal-set-lisp-face-attribute face :family (purecopy family)
                                           where))