Mercurial > emacs
comparison src/fontset.c @ 90056:b0c203a8776d
(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 | cb7f41387eb3 |
children | 5948e3220233 |
comparison
equal
deleted
inserted
replaced
90055:e4029991605f | 90056:b0c203a8776d |
---|---|
1408 appended. By default, FONT-SPEC overrides the previous settings. */) | 1408 appended. By default, FONT-SPEC overrides the previous settings. */) |
1409 (name, target, font_spec, frame, add) | 1409 (name, target, font_spec, frame, add) |
1410 Lisp_Object name, target, font_spec, frame, add; | 1410 Lisp_Object name, target, font_spec, frame, add; |
1411 { | 1411 { |
1412 Lisp_Object fontset; | 1412 Lisp_Object fontset; |
1413 Lisp_Object font_def, registry; | 1413 Lisp_Object font_def, registry, family; |
1414 Lisp_Object encoding, repertory; | 1414 Lisp_Object encoding, repertory; |
1415 Lisp_Object range_list; | 1415 Lisp_Object range_list; |
1416 struct charset *charset = NULL; | 1416 struct charset *charset = NULL; |
1417 | 1417 |
1418 fontset = check_fontset_name (name); | 1418 fontset = check_fontset_name (name); |
1447 ASET (font_spec, FONT_SPEC_REGISTRY_INDEX, registry); | 1447 ASET (font_spec, FONT_SPEC_REGISTRY_INDEX, registry); |
1448 | 1448 |
1449 } | 1449 } |
1450 else if (CONSP (font_spec)) | 1450 else if (CONSP (font_spec)) |
1451 { | 1451 { |
1452 Lisp_Object family; | |
1453 | |
1454 family = XCAR (font_spec); | 1452 family = XCAR (font_spec); |
1455 registry = XCDR (font_spec); | 1453 registry = XCDR (font_spec); |
1456 | 1454 |
1457 if (! NILP (family)) | 1455 if (! NILP (family)) |
1458 { | 1456 { |
1472 } | 1470 } |
1473 | 1471 |
1474 if (STRINGP (font_spec)) | 1472 if (STRINGP (font_spec)) |
1475 encoding = find_font_encoding (font_spec); | 1473 encoding = find_font_encoding (font_spec); |
1476 else | 1474 else |
1477 encoding = find_font_encoding (registry); | 1475 encoding = find_font_encoding (concat2 (family, registry)); |
1478 if (SYMBOLP (encoding)) | 1476 if (SYMBOLP (encoding)) |
1479 { | 1477 { |
1480 CHECK_CHARSET (encoding); | 1478 CHECK_CHARSET (encoding); |
1481 encoding = repertory = CHARSET_SYMBOL_ID (encoding); | 1479 encoding = repertory = CHARSET_SYMBOL_ID (encoding); |
1482 } | 1480 } |