1410 |
Lisp_Object name, target, font_spec, frame, add; |
Lisp_Object name, target, font_spec, frame, add; |
1411 |
{ |
{ |
1412 |
Lisp_Object fontset; |
Lisp_Object fontset; |
1413 |
Lisp_Object font_def, registry; |
Lisp_Object font_def, registry, family; |
1414 |
Lisp_Object encoding, repertory; |
Lisp_Object encoding, repertory; |
1415 |
Lisp_Object range_list; |
Lisp_Object range_list; |
1416 |
struct charset *charset = NULL; |
struct charset *charset = NULL; |
1449 |
} |
} |
1450 |
else if (CONSP (font_spec)) |
else if (CONSP (font_spec)) |
1451 |
{ |
{ |
|
Lisp_Object family; |
|
|
|
|
1452 |
family = XCAR (font_spec); |
family = XCAR (font_spec); |
1453 |
registry = XCDR (font_spec); |
registry = XCDR (font_spec); |
1454 |
|
|
1472 |
if (STRINGP (font_spec)) |
if (STRINGP (font_spec)) |
1473 |
encoding = find_font_encoding (font_spec); |
encoding = find_font_encoding (font_spec); |
1474 |
else |
else |
1475 |
encoding = find_font_encoding (registry); |
encoding = find_font_encoding (concat2 (family, registry)); |
1476 |
if (SYMBOLP (encoding)) |
if (SYMBOLP (encoding)) |
1477 |
{ |
{ |
1478 |
CHECK_CHARSET (encoding); |
CHECK_CHARSET (encoding); |