Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-57

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 324-352)

   - Merge from gnus--rel--5.10
   - Update from CVS
   - etc/emacs-buffer.gdb: Remove RCS keywords

 * gnus--rel--5.10  (patch 70-79)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0

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)
       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);
@@ -6738,7 +6739,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];
 
@@ -6748,7 +6749,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))