From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 16 Mar 2011 21:23:37 +0000 (-0700)
Subject: * font.c (font_sort_entities): Mark var as initialized.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~554^2~20
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5ad03b978fea0a7cfeb8e0b8f78484244642c1c5;p=emacs.git

* font.c (font_sort_entities): Mark var as initialized.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 210b756e0ee..1f30c599626 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
 	* font.c (font_unparse_fcname): Abort in an "impossible" situation
 	instead of using an uninitialized var.
+	(font_sort_entities): Mark var as initialized.
 
 	* character.h (FETCH_CHAR_ADVANCE): Rename locals to avoid shadowing.
 
diff --git a/src/font.c b/src/font.c
index 5df0510b518..9e8b7029c22 100644
--- a/src/font.c
+++ b/src/font.c
@@ -2177,7 +2177,7 @@ font_sort_entities (Lisp_Object list, Lisp_Object prefer, Lisp_Object frame, int
   unsigned best_score;
   Lisp_Object best_entity;
   struct frame *f = XFRAME (frame);
-  Lisp_Object tail, vec;
+  Lisp_Object tail, vec IF_LINT (= Qnil);
   USE_SAFE_ALLOCA;
 
   for (i = FONT_WEIGHT_INDEX; i <= FONT_AVGWIDTH_INDEX; i++)