[Emacs-diffs] emacs/src w32font.c

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   08/12/10 16:09:17

Modified files:
        src            : w32font.c 

Log message:
        (add_font_entity_to_list): Limit unicode-sip fonts to those that
        contain characters beyond the bmp.

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

Patches:
Index: w32font.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32font.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- w32font.c   10 Dec 2008 15:36:51 -0000      1.60
+++ w32font.c   10 Dec 2008 16:09:17 -0000      1.61
@@ -1403,11 +1403,14 @@
              ANSI and DEFAULT charsets, as most unicode fonts will
              contain one of those plus others.  */
           if ((EQ (spec_charset, Qiso10646_1)
-               || EQ (spec_charset, Qunicode_bmp)
-               || EQ (spec_charset, Qunicode_sip))
+               || EQ (spec_charset, Qunicode_bmp))
               && logical_font->elfLogFont.lfCharSet != DEFAULT_CHARSET
               && logical_font->elfLogFont.lfCharSet != ANSI_CHARSET)
             return 1;
+         /* unicode-sip fonts must contain characters beyond the BMP.  */
+         else if (EQ (spec_charset, Qunicode_sip)
+                  && !(physical_font->ntmFontSig.fsUsb[1] & 0x02000000))
+           return 1;
           /* If registry was specified, but did not map to a windows
              charset, only report fonts that have unknown charsets.
              This will still report fonts that don't match, but at