summaryrefslogtreecommitdiff
path: root/src/w32bdf.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/w32bdf.c')
-rw-r--r--src/w32bdf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/w32bdf.c b/src/w32bdf.c
index 092aff306dc..5f073dc8478 100644
--- a/src/w32bdf.c
+++ b/src/w32bdf.c
@@ -28,7 +28,7 @@ Boston, MA 02111-1307, USA. */
#endif
#include "lisp.h"
-#include "charset.h"
+#include "character.h"
#include "keyboard.h"
#include "frame.h"
#include "dispextern.h"
@@ -201,7 +201,7 @@ set_bdf_font_info(bdffont *fontp)
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)
@@ -789,7 +789,7 @@ struct font_info *w32_load_bdf_font (struct frame *f, char *fontname,
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;