aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann1999-12-22 12:11:42 +0000
committerGerd Moellmann1999-12-22 12:11:42 +0000
commit6d8e8ef35c83407aafddc7130456ee207a91a48b (patch)
treea01a00ce2ddf0b4e1a17cb75f22f75c09ce26e9e /src
parent8affcced095d1ea506b26aa4558f7356a5f01112 (diff)
downloademacs-6d8e8ef35c83407aafddc7130456ee207a91a48b.tar.gz
emacs-6d8e8ef35c83407aafddc7130456ee207a91a48b.zip
(clear_font_table): Don't use uninitialized local
variable in xassert.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/xfaces.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3b46fdb1488..193684fab36 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,12 @@
11999-12-22 Gerd Moellmann <gerd@gnu.org>
2
3 * xfaces.c (clear_font_table): Don't use uninitialized local
4 variable in xassert.
5
11999-12-22 Kenichi Handa <handa@etl.go.jp> 61999-12-22 Kenichi Handa <handa@etl.go.jp>
2 7
3 * xfaces.c (face_color_supported_p): Check by tty_defined_color 8 * xfaces.c (face_color_supported_p): Check by tty_defined_color
4 only when the frame is not window. 9 only when the frame is not for a window system.
5 10
61999-12-22 Gerd Moellmann <gerd@gnu.org> 111999-12-22 Gerd Moellmann <gerd@gnu.org>
7 12
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)
778 Lisp_Object rest, frame; 778 Lisp_Object rest, frame;
779 int i; 779 int i;
780 780
781 xassert (FRAME_X_P (f)); 781 xassert (FRAME_X_P (c->f));
782 782
783 used = (char *) alloca (dpyinfo->n_fonts * sizeof *used); 783 used = (char *) alloca (dpyinfo->n_fonts * sizeof *used);
784 bzero (used, dpyinfo->n_fonts * sizeof *used); 784 bzero (used, dpyinfo->n_fonts * sizeof *used);