mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-26 15:10:50 -08:00
Code Issues Projects Releases Wiki Activity

(fs_load_font) [WINDOWSNT && _MSC_VER]: Disable

Browse source 
optimization.  The fontp->encoding array was not being initialized
correctly when compiled with optimizations by MSVC.
This commit is contained in:
Andrew Innes 2001-10-18 16:20:00 +00:00
parent 778cb23bcb
commit 818a181b0e
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,5 +1,9 @@
2001-10-18 Andrew Innes <andrewi@gnu.org>
* 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.
* fontset.h (struct font_info) [WINDOWSNT]: Add codepage field.
* w32fns.c (w32_load_system_font): Cache codepage in font_info.

8
src/fontset.c
View file

@ -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