From: Andrew Innes Date: Thu, 18 Oct 2001 16:23:14 +0000 (+0000) Subject: (fs_load_font) [WINDOWSNT && _MSC_VER]: Disable X-Git-Tag: ttn-vms-21-2-B4~19369 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=97f4db8c94f258ac20234402fd502facfbc87be6;p=emacs.git (fs_load_font) [WINDOWSNT && _MSC_VER]: Disable optimization. The fontp->encoding array was not being initialized correctly when compiled with optimizations by MSVC. --- diff --git a/src/ChangeLog b/src/ChangeLog index 3afdbfcf6c4..bdb678eed44 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2001-10-18 Andrew Innes + + * fontset.c (fs_load_font) [WINDOWSNT && _MSC_VER]: Disable + optimization. The fontp->encoding array was not being initialized + correctly when compiled with optimizations by MSVC. + 2001-10-18 Gerd Moellmann * xdisp.c (display_line): Indicate empty lines in active diff --git a/src/fontset.c b/src/fontset.c index 983222f4bb7..7e7364b0205 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -569,6 +569,10 @@ fontset_font_pattern (f, id, c) } +#if defined(WINDOWSNT) && defined (_MSC_VER) +#pragma optimize("", off) +#endif + /* Load a font named FONTNAME to display character C on frame F. Return a pointer to the struct font_info of the loaded font. If loading fails, return NULL. If FACE is non-zero and a fontset is @@ -694,6 +698,10 @@ fs_load_font (f, c, fontname, id, face) return fontp; } +#if defined(WINDOWSNT) && defined (_MSC_VER) +#pragma optimize("", on) +#endif + /* Cache data used by fontset_pattern_regexp. The car part is a pattern string containing at least one wild card, the cdr part is