Mercurial > emacs

changeset 90056:b0c203a8776d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fset_fontset_font): Call find_font_encoding with concatenation of family and registry.
author Kenichi Handa <handa@m17n.org>
date Wed, 08 Dec 2004 23:42:20 +0000
parents e4029991605f
children 241d36dfc5ec
files src/fontset.c
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/fontset.c	Wed Dec 08 05:21:02 2004 +0000
+++ b/src/fontset.c	Wed Dec 08 23:42:20 2004 +0000
@@ -1410,7 +1410,7 @@
      Lisp_Object name, target, font_spec, frame, add;
 {
   Lisp_Object fontset;
-  Lisp_Object font_def, registry;
+  Lisp_Object font_def, registry, family;
   Lisp_Object encoding, repertory;
   Lisp_Object range_list;
   struct charset *charset = NULL;
@@ -1449,8 +1449,6 @@
     }
   else if (CONSP (font_spec))
     {
-      Lisp_Object family;
-
       family = XCAR (font_spec);
       registry = XCDR (font_spec);
 
@@ -1474,7 +1472,7 @@
   if (STRINGP (font_spec))
     encoding = find_font_encoding (font_spec);
   else
-    encoding = find_font_encoding (registry);
+    encoding = find_font_encoding (concat2 (family, registry));
   if (SYMBOLP (encoding))
     {
       CHECK_CHARSET (encoding);