[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: |
Mon, 12 Nov 2001 18:25:13 -0500 |
Index: emacs/src/w32fns.c
diff -u emacs/src/w32fns.c:1.130 emacs/src/w32fns.c:1.131
--- emacs/src/w32fns.c:1.130 Fri Nov 2 15:45:57 2001
+++ emacs/src/w32fns.c Sat Nov 10 08:51:02 2001
@@ -6672,12 +6672,18 @@
int FontType;
enumfont_t * lpef;
{
- /* Ignore struck out, underlined and vertical versions of fonts. */
- if (lplf->elfLogFont.lfStrikeOut || lplf->elfLogFont.lfUnderline
- || lplf->elfLogFont.lfEscapement != 0
- || lplf->elfLogFont.lfOrientation != 0)
+ /* Ignore struck out and underlined versions of fonts. */
+ if (lplf->elfLogFont.lfStrikeOut || lplf->elfLogFont.lfUnderline)
return 1;
+ /* Only return fonts with names starting with @ if they were
+ explicitly specified, since Microsoft uses an initial @ to
+ denote fonts for vertical writing, without providing a more
+ convenient way of identifying them. */
+ if (lplf->elfLogFont.lfFaceName[0] == '@'
+ && lpef->logfont.lfFaceName[0] != '@')
+ return 1;
+
/* Check that the character set matches if it was specified */
if (lpef->logfont.lfCharSet != DEFAULT_CHARSET &&
lplf->elfLogFont.lfCharSet != lpef->logfont.lfCharSet)
@@ -6728,7 +6734,7 @@
/* TODO: List all relevant charsets if charset not specified. */
if (!w32_to_x_font (&(lplf->elfLogFont), buf, 100, charset))
- return 0;
+ return 1;
if (NILP (*(lpef->pattern))
|| w32_font_match (buf, XSTRING (*(lpef->pattern))->data))
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2001/11/10
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2001/11/10
- [Emacs-diffs] Changes to emacs/src/w32fns.c,
Jason Rumney <=
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2001/11/12
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Pavel JanÃk, 2001/11/13
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2001/11/13
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Kim F. Storm, 2001/11/16
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2001/11/17
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2001/11/18
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2001/11/20
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2001/11/22
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2001/11/24
- [Emacs-diffs] Changes to emacs/src/w32fns.c, Jason Rumney, 2001/11/25