From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Wed, 1 Jun 2005 08:20:50 +0000 (+0000)
Subject: (mac_to_x_fontname, mac_do_list_fonts): Set XLFD
X-Git-Tag: emacs-pretest-22.0.90~9373
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b0241f69c9683975a06cce950e603af201c4a5cb;p=emacs.git

(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 b94c3a1bbba..6ebaa39437b 100644
--- 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))