diff options
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/fontset.c b/src/fontset.c index 2f6313c4214..6a6a434add0 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -1523,7 +1523,7 @@ appended. By default, FONT-SPEC overrides the previous settings. */) | |||
| 1523 | { | 1523 | { |
| 1524 | if (XFASTINT (target) < 0x80) | 1524 | if (XFASTINT (target) < 0x80) |
| 1525 | error ("Can't set a font for partial ASCII range"); | 1525 | error ("Can't set a font for partial ASCII range"); |
| 1526 | range_list = Fcons (Fcons (target, target), Qnil); | 1526 | range_list = list1 (Fcons (target, target)); |
| 1527 | } | 1527 | } |
| 1528 | else if (CONSP (target)) | 1528 | else if (CONSP (target)) |
| 1529 | { | 1529 | { |
| @@ -1539,7 +1539,7 @@ appended. By default, FONT-SPEC overrides the previous settings. */) | |||
| 1539 | error ("Can't set a font for partial ASCII range"); | 1539 | error ("Can't set a font for partial ASCII range"); |
| 1540 | ascii_changed = 1; | 1540 | ascii_changed = 1; |
| 1541 | } | 1541 | } |
| 1542 | range_list = Fcons (target, Qnil); | 1542 | range_list = list1 (target); |
| 1543 | } | 1543 | } |
| 1544 | else if (SYMBOLP (target) && !NILP (target)) | 1544 | else if (SYMBOLP (target) && !NILP (target)) |
| 1545 | { | 1545 | { |
| @@ -1552,7 +1552,7 @@ appended. By default, FONT-SPEC overrides the previous settings. */) | |||
| 1552 | { | 1552 | { |
| 1553 | if (EQ (target, Qlatin)) | 1553 | if (EQ (target, Qlatin)) |
| 1554 | ascii_changed = 1; | 1554 | ascii_changed = 1; |
| 1555 | val = Fcons (target, Qnil); | 1555 | val = list1 (target); |
| 1556 | map_char_table (accumulate_script_ranges, Qnil, Vchar_script_table, | 1556 | map_char_table (accumulate_script_ranges, Qnil, Vchar_script_table, |
| 1557 | val); | 1557 | val); |
| 1558 | range_list = Fnreverse (XCDR (val)); | 1558 | range_list = Fnreverse (XCDR (val)); |
| @@ -1568,7 +1568,7 @@ appended. By default, FONT-SPEC overrides the previous settings. */) | |||
| 1568 | SDATA (SYMBOL_NAME (target))); | 1568 | SDATA (SYMBOL_NAME (target))); |
| 1569 | } | 1569 | } |
| 1570 | else if (NILP (target)) | 1570 | else if (NILP (target)) |
| 1571 | range_list = Fcons (Qnil, Qnil); | 1571 | range_list = list1 (Qnil); |
| 1572 | else | 1572 | else |
| 1573 | error ("Invalid target for setting a font"); | 1573 | error ("Invalid target for setting a font"); |
| 1574 | 1574 | ||
| @@ -1628,7 +1628,7 @@ appended. By default, FONT-SPEC overrides the previous settings. */) | |||
| 1628 | if (! NILP (font_object)) | 1628 | if (! NILP (font_object)) |
| 1629 | { | 1629 | { |
| 1630 | update_auto_fontset_alist (font_object, fontset); | 1630 | update_auto_fontset_alist (font_object, fontset); |
| 1631 | alist = Fcons (Fcons (Qfont, Fcons (name, font_object)), Qnil); | 1631 | alist = list1 (Fcons (Qfont, Fcons (name, font_object))); |
| 1632 | Fmodify_frame_parameters (fr, alist); | 1632 | Fmodify_frame_parameters (fr, alist); |
| 1633 | } | 1633 | } |
| 1634 | } | 1634 | } |
| @@ -1999,7 +1999,7 @@ format is the same as above. */) | |||
| 1999 | slot = Fassq (RFONT_DEF_SPEC (elt), alist); | 1999 | slot = Fassq (RFONT_DEF_SPEC (elt), alist); |
| 2000 | name = AREF (font_object, FONT_NAME_INDEX); | 2000 | name = AREF (font_object, FONT_NAME_INDEX); |
| 2001 | if (NILP (Fmember (name, XCDR (slot)))) | 2001 | if (NILP (Fmember (name, XCDR (slot)))) |
| 2002 | nconc2 (slot, Fcons (name, Qnil)); | 2002 | nconc2 (slot, list1 (name)); |
| 2003 | } | 2003 | } |
| 2004 | } | 2004 | } |
| 2005 | } | 2005 | } |
| @@ -2238,9 +2238,9 @@ alternate fontnames (if any) are tried instead. */); | |||
| 2238 | 2238 | ||
| 2239 | DEFVAR_LISP ("fontset-alias-alist", Vfontset_alias_alist, | 2239 | DEFVAR_LISP ("fontset-alias-alist", Vfontset_alias_alist, |
| 2240 | doc: /* Alist of fontset names vs the aliases. */); | 2240 | doc: /* Alist of fontset names vs the aliases. */); |
| 2241 | Vfontset_alias_alist = Fcons (Fcons (FONTSET_NAME (Vdefault_fontset), | 2241 | Vfontset_alias_alist |
| 2242 | build_pure_c_string ("fontset-default")), | 2242 | = list1 (Fcons (FONTSET_NAME (Vdefault_fontset), |
| 2243 | Qnil); | 2243 | build_pure_c_string ("fontset-default"))); |
| 2244 | 2244 | ||
| 2245 | DEFVAR_LISP ("vertical-centering-font-regexp", | 2245 | DEFVAR_LISP ("vertical-centering-font-regexp", |
| 2246 | Vvertical_centering_font_regexp, | 2246 | Vvertical_centering_font_regexp, |