emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Miles Bader
Subject: [Emacs-diffs] Changes to emacs/src/w32fns.c,v
Date: Mon, 25 Feb 2008 00:22:00 +0000

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/02/25 00:21:58

Index: src/w32fns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32fns.c,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -b -r1.314 -r1.315
--- src/w32fns.c        24 Feb 2008 10:09:01 -0000      1.314
+++ src/w32fns.c        25 Feb 2008 00:21:57 -0000      1.315
@@ -6063,6 +6063,12 @@
            && lpef->logfont.lfCharSet == DEFAULT_CHARSET
            && strcmp (charset, w32_to_x_charset (DEFAULT_CHARSET, NULL)) != 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)
@@ -6079,6 +6085,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;
+
        enum_font_maybe_add_to_list (lpef, &(lplf->elfLogFont),
                                     charset, width);
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]