[Emacs-diffs] emacs/src w32font.c

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   09/02/12 14:59:23

Modified files:
        src            : w32font.c 

Log message:
        (check_face_name): Check for fake helv.  (Bug#2275)
        (add_font_entity_to_list): Call check_face_name even when family
        is unspecified.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32font.c?cvsroot=emacs&r1=1.69&r2=1.70

Patches:
Index: w32font.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32font.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- w32font.c   12 Feb 2009 13:58:29 -0000      1.69
+++ w32font.c   12 Feb 2009 14:59:22 -0000      1.70
@@ -1374,6 +1374,14 @@
       _strlwr (full_iname);
       return strstr ("helvetica", full_iname) != NULL;
     }
+  /* Same for Helv.  */
+  if (!xstrcasecmp (font->lfFaceName, "helv"))
+    {
+      strncpy (full_iname, full_name, LF_FULLFACESIZE);
+      full_iname[LF_FULLFACESIZE] = 0;
+      _strlwr (full_iname);
+      return strstr ("helv", full_iname) != NULL;
+    }
 
   /* Since Times is mapped to Times New Roman, a substring
      match is not sufficient to filter out the bogus match.  */
@@ -1437,8 +1445,7 @@
                   logical_font->elfLogFont.lfFaceName))
       /* Check for well known substitutions that mess things up in the
         presence of Type-1 fonts of the same name.  */
-      || (match_data->pattern.lfFaceName[0]
-         && !check_face_name (&logical_font->elfLogFont,
+      || (!check_face_name (&logical_font->elfLogFont,
                               logical_font->elfFullName)))
     return 1;