aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog1
-rw-r--r--src/font.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 210b756e0e..1f30c59962 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 5df0510b51..9e8b7029c2 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++)