Index: emacs/src/macterm.c
diff -c emacs/src/macterm.c:1.115 emacs/src/macterm.c:1.116
*** emacs/src/macterm.c:1.115 Fri May 13 08:42:38 2005
--- emacs/src/macterm.c Wed Jun 1 08:20:50 2005
***************
*** 6256,6264 ****
strcpy(family, name);
}
! sprintf(xf, "-%s-%s-%s-%c-normal--%d-%d-75-75-m-%d-%s",
foundry, family, style & bold ? "bold" : "medium",
! style & italic ? 'i' : 'r', size, size * 10, size * 10, charset);
result = (char *) xmalloc (strlen (xf) + 1);
strcpy (result, xf);
--- 6256,6265 ----
strcpy(family, name);
}
! 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 ? 75 : 0, size ? 75 : 0, size * 10, charset);
result = (char *) xmalloc (strlen (xf) + 1);
strcpy (result, xf);
***************
*** 6714,6720 ****
break;
}
else if (scl_val[XLFD_SCL_PIXEL_SIZE] > 0
! && (ptr = strstr (font_name_table[i], "-0-0-75-75-m-0-")))
{
int former_len = ptr - font_name_table[i];
--- 6715,6721 ----
break;
}
else if (scl_val[XLFD_SCL_PIXEL_SIZE] > 0
! && (ptr = strstr (font_name_table[i], "-0-0-0-0-m-0-")))
{
int former_len = ptr - font_name_table[i];
***************
*** 6724,6730 ****
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);
fontname = mac_c_string_match (pattern_regex, scaled,
nonspecial, exact);
if (!NILP (fontname))
--- 6725,6731 ----
scl_val[XLFD_SCL_PIXEL_SIZE],
scl_val[XLFD_SCL_POINT_SIZE],
scl_val[XLFD_SCL_AVGWIDTH],
! ptr + sizeof ("-0-0-0-0-m-0-") - 1);
fontname = mac_c_string_match (pattern_regex, scaled,
nonspecial, exact);
if (!NILP (fontname))
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
