[Emacs-diffs] Changes to emacs/src/w32fns.c,v [EMACS_22_BASE]

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Jason Rumney <jasonr>   08/02/24 22:02:47

Index: w32fns.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32fns.c,v
retrieving revision 1.288.2.14
retrieving revision 1.288.2.15
diff -u -b -r1.288.2.14 -r1.288.2.15
--- w32fns.c    18 Feb 2008 11:34:29 -0000      1.288.2.14
+++ w32fns.c    24 Feb 2008 22:02:47 -0000      1.288.2.15
@@ -5847,6 +5847,12 @@
            && lpef->logfont.lfCharSet == DEFAULT_CHARSET
            && strcmp (charset, w32_to_x_charset (DEFAULT_CHARSET)) != 0)
          return 1;
+
+        /* Reject raster fonts if we are looking for a unicode font.  */
+        if (charset
+            && FontType == RASTER_FONTTYPE
+            && strncmp (charset, "iso10646", 8) == 0)
+          return 1;
       }
 
     if (charset)
@@ -5860,6 +5866,12 @@
        Lisp_Object this_charset = Fcar (charset_list);
        charset = SDATA (this_charset);
 
+        /* Don't list  raster fonts as unicode.  */
+        if (charset
+            && FontType == RASTER_FONTTYPE
+            && strncmp (charset, "iso10646", 8) == 0)
+          continue;
+
        /* List bold and italic variations if w32-enable-synthesized-fonts
           is non-nil and this is a plain font.  */
        if (w32_enable_synthesized_fonts