diff options
Diffstat (limited to 'src/macterm.c')
| -rw-r--r-- | src/macterm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/macterm.c b/src/macterm.c index e79803f7c4d..13d8fb455d8 100644 --- a/src/macterm.c +++ b/src/macterm.c | |||
| @@ -6277,9 +6277,10 @@ mac_to_x_fontname (name, size, style, charset) | |||
| 6277 | strcpy(family, name); | 6277 | strcpy(family, name); |
| 6278 | } | 6278 | } |
| 6279 | 6279 | ||
| 6280 | sprintf(xf, "-%s-%s-%s-%c-normal--%d-%d-75-75-m-%d-%s", | 6280 | sprintf(xf, "-%s-%s-%s-%c-normal--%d-%d-%d-%d-m-%d-%s", |
| 6281 | foundry, family, style & bold ? "bold" : "medium", | 6281 | foundry, family, style & bold ? "bold" : "medium", |
| 6282 | style & italic ? 'i' : 'r', size, size * 10, size * 10, charset); | 6282 | style & italic ? 'i' : 'r', size, size * 10, |
| 6283 | size ? 75 : 0, size ? 75 : 0, size * 10, charset); | ||
| 6283 | 6284 | ||
| 6284 | result = (char *) xmalloc (strlen (xf) + 1); | 6285 | result = (char *) xmalloc (strlen (xf) + 1); |
| 6285 | strcpy (result, xf); | 6286 | strcpy (result, xf); |
| @@ -6738,7 +6739,7 @@ mac_do_list_fonts (pattern, maxnames) | |||
| 6738 | break; | 6739 | break; |
| 6739 | } | 6740 | } |
| 6740 | else if (scl_val[XLFD_SCL_PIXEL_SIZE] > 0 | 6741 | else if (scl_val[XLFD_SCL_PIXEL_SIZE] > 0 |
| 6741 | && (ptr = strstr (font_name_table[i], "-0-0-75-75-m-0-"))) | 6742 | && (ptr = strstr (font_name_table[i], "-0-0-0-0-m-0-"))) |
| 6742 | { | 6743 | { |
| 6743 | int former_len = ptr - font_name_table[i]; | 6744 | int former_len = ptr - font_name_table[i]; |
| 6744 | 6745 | ||
| @@ -6748,7 +6749,7 @@ mac_do_list_fonts (pattern, maxnames) | |||
| 6748 | scl_val[XLFD_SCL_PIXEL_SIZE], | 6749 | scl_val[XLFD_SCL_PIXEL_SIZE], |
| 6749 | scl_val[XLFD_SCL_POINT_SIZE], | 6750 | scl_val[XLFD_SCL_POINT_SIZE], |
| 6750 | scl_val[XLFD_SCL_AVGWIDTH], | 6751 | scl_val[XLFD_SCL_AVGWIDTH], |
| 6751 | ptr + sizeof ("-0-0-75-75-m-0-") - 1); | 6752 | ptr + sizeof ("-0-0-0-0-m-0-") - 1); |
| 6752 | fontname = mac_c_string_match (pattern_regex, scaled, | 6753 | fontname = mac_c_string_match (pattern_regex, scaled, |
| 6753 | nonspecial, exact); | 6754 | nonspecial, exact); |
| 6754 | if (!NILP (fontname)) | 6755 | if (!NILP (fontname)) |