Mercurial > emacs
changeset 62944:35f25c15b8c2
(mac_to_x_fontname, mac_do_list_fonts): Set XLFD
resolution fields for scalable fonts to 0.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Wed, 01 Jun 2005 08:20:50 +0000 |
| parents | 11d53dd5abd9 |
| children | 179873645b73 |
| files | src/macterm.c |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macterm.c Wed Jun 01 05:07:06 2005 +0000 +++ b/src/macterm.c Wed Jun 01 08:20:50 2005 +0000 @@ -6256,9 +6256,10 @@ strcpy(family, name); } - sprintf(xf, "-%s-%s-%s-%c-normal--%d-%d-75-75-m-%d-%s", + sprintf(xf, "-%s-%s-%s-%c-normal--%d-%d-%d-%d-m-%d-%s", foundry, family, style & bold ? "bold" : "medium", - style & italic ? 'i' : 'r', size, size * 10, size * 10, charset); + style & italic ? 'i' : 'r', size, size * 10, + size ? 75 : 0, size ? 75 : 0, size * 10, charset); result = (char *) xmalloc (strlen (xf) + 1); strcpy (result, xf); @@ -6714,7 +6715,7 @@ break; } else if (scl_val[XLFD_SCL_PIXEL_SIZE] > 0 - && (ptr = strstr (font_name_table[i], "-0-0-75-75-m-0-"))) + && (ptr = strstr (font_name_table[i], "-0-0-0-0-m-0-"))) { int former_len = ptr - font_name_table[i]; @@ -6724,7 +6725,7 @@ scl_val[XLFD_SCL_PIXEL_SIZE], scl_val[XLFD_SCL_POINT_SIZE], scl_val[XLFD_SCL_AVGWIDTH], - ptr + sizeof ("-0-0-75-75-m-0-") - 1); + ptr + sizeof ("-0-0-0-0-m-0-") - 1); fontname = mac_c_string_match (pattern_regex, scaled, nonspecial, exact); if (!NILP (fontname))