2 files changed, 3 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fb266a71a0f..44782386684 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,8 @@
         or move locals to avoid shadowing.
         (tty_defined_color, merge_face_heights): Now static.
         (free_realized_faces_for_fontset): Remove; not used.
+        (Fx_list_fonts): Mark variable that gcc -Wuninitialized
+        does not deduce is never used uninitialized.
 
         * terminal.c (store_terminal_param): Now static.
 
diff --git a/src/xfaces.c b/src/xfaces.c
index b49675a7d8e..ded871d1fdd 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1720,7 +1720,7 @@ the WIDTH times as wide as FACE on FRAME.  */)
   (Lisp_Object pattern, Lisp_Object face, Lisp_Object frame, Lisp_Object maximum, Lisp_Object width)
 {
   struct frame *f;
-  int size, avgwidth;
+  int size, avgwidth IF_LINT (= 0);
 
   check_x ();
   CHECK_STRING (pattern);