From 3a92c0959382593b23f02e71b5033f3f7b29f019 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Tue, 19 May 2009 01:28:54 +0000 Subject: [PATCH] (set-face-attribute): Fix handling of :family "FOUNDRY-FAMILY". --- lisp/ChangeLog | 5 +++++ lisp/faces.el | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bef81745c1..1ce5defa54 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-05-19 Kenichi Handa + + * faces.el (set-face-attribute): Fix handling of :family + "FOUNDRY-FAMILY". + 2009-05-18 Chong Yidong * register.el (register-alist): Doc fix (Bug#3311). diff --git a/lisp/faces.el b/lisp/faces.el index 778a363b17..57d6bd7dcb 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)) -- 2.39.2