2 files changed, 4 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6d22732b5e0..c6f973af8c7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -89,6 +89,7 @@
 
         * cm.c (cmgoto): Mark variables that gcc -Wuninitialized does not
         deduce are never used uninitialized.
+        * term.c (encode_terminal_code): Likewise.
 
         * term.c (encode_terminal_code): Now static.  Remove unused local.
 
diff --git a/src/term.c b/src/term.c
index e9e880a0c7f..e78e2e68814 100644
--- a/src/term.c
+++ b/src/term.c
@@ -533,8 +533,8 @@ encode_terminal_code (struct glyph *src, int src_len, struct coding_system *codi
     {
       if (src->type == COMPOSITE_GLYPH)
         {
-          struct composition *cmp;
-          Lisp_Object gstring;
+          struct composition *cmp IF_LINT (= NULL);
+          Lisp_Object gstring IF_LINT (= Qnil);
           int i;
 
           nbytes = buf - encode_terminal_src;
@@ -595,7 +595,7 @@ encode_terminal_code (struct glyph *src, int src_len, struct coding_system *codi
       else if (! CHAR_GLYPH_PADDING_P (*src))
         {
           GLYPH g;
-          int c;
+          int c IF_LINT (= 0);
           Lisp_Object string;
 
           string = Qnil;