Mercurial > emacs

comparison src/w32fns.c @ 80195:6151abddc158

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(enum_font_cb2): Don't use raster fonts for Unicode.
author Jason Rumney <jasonr@gnu.org>
date Sun, 24 Feb 2008 22:02:47 +0000
parents 001f79563e5a
children d315e19167d6 049a396d6d9d
comparison
equal deleted inserted replaced
80194:00f28ef41efd 80195:6151abddc158
5845 if (charset 5845 if (charset
5846 && strncmp (charset, "*-*", 3) != 0 5846 && strncmp (charset, "*-*", 3) != 0
5847 && lpef->logfont.lfCharSet == DEFAULT_CHARSET 5847 && lpef->logfont.lfCharSet == DEFAULT_CHARSET
5848 && strcmp (charset, w32_to_x_charset (DEFAULT_CHARSET)) != 0) 5848 && strcmp (charset, w32_to_x_charset (DEFAULT_CHARSET)) != 0)
5849 return 1; 5849 return 1;
5850
5851 /* Reject raster fonts if we are looking for a unicode font. */
5852 if (charset
5853 && FontType == RASTER_FONTTYPE
5854 && strncmp (charset, "iso10646", 8) == 0)
5855 return 1;
5850 } 5856 }
5851 5857
5852 if (charset) 5858 if (charset)
5853 charset_list = Fcons (build_string (charset), Qnil); 5859 charset_list = Fcons (build_string (charset), Qnil);
5854 else 5860 else
5857 /* Loop through the charsets. */ 5863 /* Loop through the charsets. */
5858 for ( ; CONSP (charset_list); charset_list = Fcdr (charset_list)) 5864 for ( ; CONSP (charset_list); charset_list = Fcdr (charset_list))
5859 { 5865 {
5860 Lisp_Object this_charset = Fcar (charset_list); 5866 Lisp_Object this_charset = Fcar (charset_list);
5861 charset = SDATA (this_charset); 5867 charset = SDATA (this_charset);
5868
5869 /* Don't list raster fonts as unicode. */
5870 if (charset
5871 && FontType == RASTER_FONTTYPE
5872 && strncmp (charset, "iso10646", 8) == 0)
5873 continue;
5862 5874
5863 /* List bold and italic variations if w32-enable-synthesized-fonts 5875 /* List bold and italic variations if w32-enable-synthesized-fonts
5864 is non-nil and this is a plain font. */ 5876 is non-nil and this is a plain font. */
5865 if (w32_enable_synthesized_fonts 5877 if (w32_enable_synthesized_fonts
5866 && lplf->elfLogFont.lfWeight == FW_NORMAL 5878 && lplf->elfLogFont.lfWeight == FW_NORMAL