(mac_to_x_fontname, mac_do_list_fonts): Set XLFD

resolution fields for scalable fonts to 0.

diff --git a/src/macterm.c b/src/macterm.c
index b94c3a1..6ebaa39 100644 (file)
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -6256,9 +6256,10 @@ mac_to_x_fontname (name, size, style, charset)
       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 @@ mac_do_list_fonts (pattern, maxnames)
            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 @@ mac_do_list_fonts (pattern, maxnames)
                   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))