From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 22 Dec 1999 12:11:42 +0000 (+0000)
Subject: (clear_font_table): Don't use uninitialized local
X-Git-Tag: emacs-pretest-21.0.90~5646
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6d8e8ef35c83407aafddc7130456ee207a91a48b;p=emacs.git

(clear_font_table): Don't use uninitialized local
variable in xassert.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 3b46fdb1488..193684fab36 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,12 @@
+1999-12-22  Gerd Moellmann  <gerd@gnu.org>
+
+	* xfaces.c (clear_font_table): Don't use uninitialized local
+	variable in xassert.
+
 1999-12-22  Kenichi Handa  <handa@etl.go.jp>
 
 	* xfaces.c (face_color_supported_p): Check by tty_defined_color
-	only when the frame is not window.
+	only when the frame is not for a window system.
 
 1999-12-22  Gerd Moellmann  <gerd@gnu.org>
 
diff --git a/src/xfaces.c b/src/xfaces.c
index 5bccdc4baac..cdb1612f048 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -778,7 +778,7 @@ clear_font_table (f)
   Lisp_Object rest, frame;
   int i;
 
-  xassert (FRAME_X_P (f));
+  xassert (FRAME_X_P (c->f));
 
   used = (char *) alloca (dpyinfo->n_fonts * sizeof *used);
   bzero (used, dpyinfo->n_fonts * sizeof *used);