2 files changed, 2 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5dda0430849..7d4d5e00df1 100644
--- 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 d732820c28a..3c156691b1b 100644
--- 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. */