diff --git a/src/ChangeLog b/src/ChangeLog
index fa16bab29c9..ca10b31305d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,7 @@
 	avoid shadowing.
 	(composition_reseat_it): Remove unused locals.
 	(find_automatic_composition, composition_adjust_point): Likewise.
+	(composition_update_it): Mark var as initialized.
 
 2011-03-18  Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/src/composite.c b/src/composite.c
index 86a53f91c97..ee2e843b729 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1364,7 +1364,7 @@ composition_reseat_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_I
 int
 composition_update_it (struct composition_it *cmp_it, EMACS_INT charpos, EMACS_INT bytepos, Lisp_Object string)
 {
-  int i, c;
+  int i, c IF_LINT (= 0);
 
   if (cmp_it->ch < 0)
     {