* image.c (gif_load): Rename local to avoid shadowing.

diff --git a/src/ChangeLog b/src/ChangeLog
index f54d40d..d25f991 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-08  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * image.c (gif_load): Rename local to avoid shadowing.
+
        * lisp.h (SAFE_ALLOCA_LISP): Check for integer overflow.
        (struct Lisp_Save_Value): Use ptrdiff_t, not int, for 'integer' member.
        * alloc.c (make_save_value): Integer argument is now of type

diff --git a/src/image.c b/src/image.c
index cdf05c7..31b3f01 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -7146,12 +7146,12 @@ gif_load (struct frame *f, struct image *img)
 
   /* Which sub-image are we to display?  */
   {
-    Lisp_Object index = image_spec_value (img->spec, QCindex, NULL);
-    idx = INTEGERP (index) ? XFASTINT (index) : 0;
+    Lisp_Object image_number = image_spec_value (img->spec, QCindex, NULL);
+    idx = INTEGERP (image_number) ? XFASTINT (image_number) : 0;
     if (idx < 0 || idx >= gif->ImageCount)
       {
        image_error ("Invalid image number `%s' in image `%s'",
-                    index, img->spec);
+                    image_number, img->spec);
        fn_DGifCloseFile (gif);
        return 0;
       }