2 files changed, 3 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 39f806283f3..c108bb38bea 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -34,6 +34,8 @@
         Include <limits.h>.
         (Fsort_charsets): Redo min/max calculation to shorten the code a bit
         and to avoid gcc -Wuninitialized warning.
+        (load_charset_map): Mark variables that gcc -Wuninitialized
+        does not deduce are never used uninitialized.
 
 2011-03-06  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/src/charset.c b/src/charset.c
index 0ce548d5a18..e46dadab93a 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -251,7 +251,7 @@ struct charset_map_entries
 static void
 load_charset_map (struct charset *charset, struct charset_map_entries *entries, int n_entries, int control_flag)
 {
-  Lisp_Object vec, table;
+  Lisp_Object vec IF_LINT (= Qnil), table IF_LINT (= Qnil);
   unsigned max_code = CHARSET_MAX_CODE (charset);
   int ascii_compatible_p = charset->ascii_compatible_p;
   int min_char, max_char, nonascii_min_char;