* composite.c (composition_update_it): Mark var as initialized.

diff --git a/src/ChangeLog b/src/ChangeLog
index fa16bab29c95257ad85d6c9a288f3ee24f5f8854..ca10b31305db46d6078ac913962be4145002e510 100644 (file)
--- 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 86a53f91c975123529611ac4174080b8893b2164..ee2e843b72984126279859af84a8e6040c43c81f 100644 (file)
--- 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)
     {