From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 10 Mar 2011 01:44:38 +0000 (-0800)
Subject: * fontset.c (fontset_font): Mark local as initialized.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~605^2^2~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cc6e5db1ae708b81f02945f6c6dbe11e92fa1d46;p=emacs.git

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

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. */