/[emacs]/emacs/src/macterm.c
ViewVC logotype

Diff of /emacs/src/macterm.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.115 by mituharu, Fri May 13 08:42:38 2005 UTC revision 1.116 by mituharu, Wed Jun 1 08:20:50 2005 UTC
# Line 6256  mac_to_x_fontname (name, size, style, ch Line 6256  mac_to_x_fontname (name, size, style, ch
6256        strcpy(family, name);        strcpy(family, name);
6257      }      }
6258    
6259    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",
6260            foundry, family, style & bold ? "bold" : "medium",            foundry, family, style & bold ? "bold" : "medium",
6261            style & italic ? 'i' : 'r', size, size * 10, size * 10, charset);            style & italic ? 'i' : 'r', size, size * 10,
6262              size ? 75 : 0, size ? 75 : 0, size * 10, charset);
6263    
6264    result = (char *) xmalloc (strlen (xf) + 1);    result = (char *) xmalloc (strlen (xf) + 1);
6265    strcpy (result, xf);    strcpy (result, xf);
# Line 6714  mac_do_list_fonts (pattern, maxnames) Line 6715  mac_do_list_fonts (pattern, maxnames)
6715              break;              break;
6716          }          }
6717        else if (scl_val[XLFD_SCL_PIXEL_SIZE] > 0        else if (scl_val[XLFD_SCL_PIXEL_SIZE] > 0
6718                 && (ptr = strstr (font_name_table[i], "-0-0-75-75-m-0-")))                 && (ptr = strstr (font_name_table[i], "-0-0-0-0-m-0-")))
6719          {          {
6720            int former_len = ptr - font_name_table[i];            int former_len = ptr - font_name_table[i];
6721    
# Line 6724  mac_do_list_fonts (pattern, maxnames) Line 6725  mac_do_list_fonts (pattern, maxnames)
6725                     scl_val[XLFD_SCL_PIXEL_SIZE],                     scl_val[XLFD_SCL_PIXEL_SIZE],
6726                     scl_val[XLFD_SCL_POINT_SIZE],                     scl_val[XLFD_SCL_POINT_SIZE],
6727                     scl_val[XLFD_SCL_AVGWIDTH],                     scl_val[XLFD_SCL_AVGWIDTH],
6728                     ptr + sizeof ("-0-0-75-75-m-0-") - 1);                     ptr + sizeof ("-0-0-0-0-m-0-") - 1);
6729            fontname = mac_c_string_match (pattern_regex, scaled,            fontname = mac_c_string_match (pattern_regex, scaled,
6730                                           nonspecial, exact);                                           nonspecial, exact);
6731            if (!NILP (fontname))            if (!NILP (fontname))

Legend:
Removed from v.1.115  
changed lines
  Added in v.1.116

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26