[Emacs-diffs] Changes to emacs/src/w32bdf.c [emacs-unicode-2]

[Jason Rumney]

Index: emacs/src/w32bdf.c
diff -c emacs/src/w32bdf.c:1.17.6.1 emacs/src/w32bdf.c:1.17.6.2
*** emacs/src/w32bdf.c:1.17.6.1 Mon Sep  8 08:48:14 2003
--- emacs/src/w32bdf.c  Sat Oct 11 18:18:29 2003
***************
*** 201,207 ****
      else if (search_file_line("CHARSET_ENCODING", start, len,
                              (char **)&p, (char **)&q) == 1)
        {
!         fontp->encoding = get_quoted_string(p, q);
        }
      else if (search_file_line("SLANT", start, len,
                              (char **)&p, (char **)&q) == 1)
--- 201,207 ----
      else if (search_file_line("CHARSET_ENCODING", start, len,
                              (char **)&p, (char **)&q) == 1)
        {
!       fontp->encoding = get_quoted_string(p, q);
        }
      else if (search_file_line("SLANT", start, len,
                              (char **)&p, (char **)&q) == 1)
***************
*** 768,773 ****
--- 768,774 ----
  
    /* 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,791 ****
         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->baseline_offset = bdf_font->yoffset;
      fontp->relative_compose = bdf_font->relative_compose;
      fontp->default_ascent = bdf_font->default_ascent;
--- 786,792 ----
         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_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;