2 files changed, 8 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ca10b31305d..f856a24fbdd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,7 @@
         (composition_reseat_it): Remove unused locals.
         (find_automatic_composition, composition_adjust_point): Likewise.
         (composition_update_it): Mark var as initialized.
+        (find_automatic_composition): Mark vars as initialized, with a FIXME.
 
 2011-03-18  Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/src/composite.c b/src/composite.c
index ee2e843b729..bc5644a4612 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1489,7 +1489,13 @@ find_automatic_composition (EMACS_INT pos, EMACS_INT limit, EMACS_INT *start, EM
   EMACS_INT head, tail, stop;
   /* Limit to check a composition after POS.  */
   EMACS_INT fore_check_limit;
-  struct position_record orig, cur, check, prev;
+  struct position_record orig, cur;
+
+  /* FIXME: It's not obvious whether these two variables need initialization.
+     If they do, please supply initial values.
+     If not, please remove this comment.  */
+  struct position_record check IF_LINT (= {0}), prev IF_LINT (= {0});
+
   Lisp_Object check_val, val, elt;
   int c;
   Lisp_Object window;