* fontset.c (fontset_font): Mark local as initialized.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5dda04308490e1cc25ba798e4fab56b7337103b8..7d4d5e00df18317cdbc894e528ea681d4b6b1f17 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
        * fontset.c (free_realized_fontset): Now static.
        (Fset_fontset_font): Rename local to avoid shadowing.
+       (fontset_font): Mark local as initialized.
 
        * xrdb.c: Include "xterm.h", to check x_load_resources's interface.
 

diff --git a/src/fontset.c b/src/fontset.c
index d732820c28ac3e5f58ab3853cbc29df846f8b218..3c156691b1be51b852275e2f726c779198f0d3a8 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -713,7 +713,7 @@ fontset_find_font (Lisp_Object fontset, int c, struct face *face, int id, int fa
 static Lisp_Object
 fontset_font (Lisp_Object fontset, int c, struct face *face, int id)
 {
-  Lisp_Object rfont_def, default_rfont_def;
+  Lisp_Object rfont_def, default_rfont_def IF_LINT (= Qnil);
   Lisp_Object base_fontset;
 
   /* Try a font-group of FONTSET. */