From: Kenichi Handa <handa@m17n.org>
Date: Fri, 3 Oct 2003 11:36:59 +0000 (+0000)
Subject: (x_load_font): Clear all members of FONTP before start filling them.
X-Git-Tag: ttn-vms-21-2-B4~8636
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be2fdba9dfa211aadf2bd5da9c778e1ee3eb96d0;p=emacs.git

(x_load_font): Clear all members of FONTP before start filling them.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 8bd48cb74f5..db8271e3d13 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2003-10-03  Kenichi Handa  <handa@m17n.org>
+
+	* macterm.c (x_load_font): Clear all members of FONTP before start
+	filling them.
+
+2003-10-02  Kenichi Handa  <handa@m17n.org>
+
+	* fontset.c (fs_load_font): Don't set fontp->font_encoder to NULL
+	before calling find_ccl_program_func.  Call find_ccl_program_func
+	only when fontp->font_encoder is not NULL.
+
+	* xterm.c (x_load_font): Clear all members of FONTP before start
+	filling them.
+
 2003-10-03  John Paul Wallington  <jpw@gnu.org>
 
 	* keymap.c (map_keymap): Don't abort when binding is a vector.
diff --git a/src/macterm.c b/src/macterm.c
index 8c22d047939..fc9b890db18 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -6240,6 +6240,7 @@ x_load_font (f, fontname, size)
 
     /* Now fill in the slots of *FONTP.  */
     BLOCK_INPUT;
+    bzero (fontp, sizeof (*fontp));
     fontp->font = font;
     fontp->font_idx = i;
     fontp->name = (char *) xmalloc (strlen (font->fontname) + 1);