[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/w32fns.c
From: |
Jason Rumney |
Subject: |
[Emacs-diffs] Changes to emacs/src/w32fns.c |
Date: |
Fri, 08 Feb 2002 20:25:10 -0500 |
Index: emacs/src/w32fns.c
diff -c emacs/src/w32fns.c:1.152 emacs/src/w32fns.c:1.153
*** emacs/src/w32fns.c:1.152 Thu Jan 24 15:46:32 2002
--- emacs/src/w32fns.c Fri Feb 8 20:08:33 2002
***************
*** 7038,7048 ****
{
charset = xlfd_charset_of_font (XSTRING(*(lpef->pattern))->data);
! /* Ensure that charset is valid for this font.
! Continue if invalid in case charset contains a wildcard. */
! if (charset
! && (x_to_w32_charset (charset) != lplf->elfLogFont.lfCharSet))
! charset = NULL;
}
if (charset)
--- 7038,7050 ----
{
charset = xlfd_charset_of_font (XSTRING(*(lpef->pattern))->data);
! /* We already checked charsets above, but DEFAULT_CHARSET
! slipped through. So only allow exact matches for DEFAULT_CHARSET.
*/
! if (charset
! && strncmp (charset, "*-*", 3) != 0
! && lpef->logfont.lfCharSet == DEFAULT_CHARSET
! && strcmp (charset, w32_to_x_charset (DEFAULT_CHARSET)) != 0)
! return 1;
}
if (charset)
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2002/02/08
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2002/02/08
- [Emacs-diffs] Changes to emacs/src/w32fns.c,
Jason Rumney <=
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2002/02/08
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2002/02/17
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2002/02/22
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2002/02/23