Mercurial > emacs
changeset 89583:01eb71b7bb3f
(w32_load_bdf_font): Clear font_info before filling.
encoding becomes encoding_type.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Sat, 11 Oct 2003 22:18:29 +0000 |
| parents | 25001d51c9f5 |
| children | 58f1c6bf05ba |
| files | src/w32bdf.c |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/w32bdf.c Sat Oct 11 22:15:08 2003 +0000 +++ b/src/w32bdf.c Sat Oct 11 22:18:29 2003 +0000 @@ -201,7 +201,7 @@ else if (search_file_line("CHARSET_ENCODING", start, len, (char **)&p, (char **)&q) == 1) { - fontp->encoding = get_quoted_string(p, q); + fontp->encoding = get_quoted_string(p, q); } else if (search_file_line("SLANT", start, len, (char **)&p, (char **)&q) == 1) @@ -768,6 +768,7 @@ /* Now fill in the slots of *FONTP. */ BLOCK_INPUT; + bzero (fontp, sizeof (*fontp)); fontp->font = font; fontp->font_idx = dpyinfo->n_fonts; fontp->name = (char *) xmalloc (strlen (fontname) + 1); @@ -785,7 +786,7 @@ uses this font. So, we set informatoin in fontp->encoding[1] which is never used by any charset. If mapping can't be decided, set FONT_ENCODING_NOT_DECIDED. */ - fontp->encoding[1] = FONT_ENCODING_NOT_DECIDED; + fontp->encoding_type = FONT_ENCODING_NOT_DECIDED; fontp->baseline_offset = bdf_font->yoffset; fontp->relative_compose = bdf_font->relative_compose; fontp->default_ascent = bdf_font->default_ascent;