[Emacs-diffs] Changes to emacs/src/image.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/image.c
diff -u emacs/src/image.c:1.51 emacs/src/image.c:1.52
--- emacs/src/image.c:1.51      Mon Apr  3 01:23:03 2006
+++ emacs/src/image.c   Wed Apr 12 08:05:52 2006
@@ -4379,7 +4379,7 @@
          if (color == NULL)
            goto failure;
 
-         while (str = strtok (NULL, " \t"))
+         while ((str = strtok (NULL, " \t")) != NULL)
            {
              next_key = xpm_str_to_color_key (str);
              if (next_key >= 0)
@@ -4407,17 +4407,21 @@
          Lisp_Object specified_color = Fassoc (symbol_color, color_symbols);
 
          if (CONSP (specified_color) && STRINGP (XCDR (specified_color)))
-           if (xstricmp (SDATA (XCDR (specified_color)), "None") == 0)
-             color_val = Qt;
-           else if (x_defined_color (f, SDATA (XCDR (specified_color)),
-                                     &cdef, 0))
-             color_val = make_number (cdef.pixel);
+           {
+             if (xstricmp (SDATA (XCDR (specified_color)), "None") == 0)
+               color_val = Qt;
+             else if (x_defined_color (f, SDATA (XCDR (specified_color)),
+                                       &cdef, 0))
+               color_val = make_number (cdef.pixel);
+           }
        }
       if (NILP (color_val) && max_key > 0)
-       if (xstricmp (max_color, "None") == 0)
-         color_val = Qt;
-       else if (x_defined_color (f, max_color, &cdef, 0))
-         color_val = make_number (cdef.pixel);
+       {
+         if (xstricmp (max_color, "None") == 0)
+           color_val = Qt;
+         else if (x_defined_color (f, max_color, &cdef, 0))
+           color_val = make_number (cdef.pixel);
+       }
       if (!NILP (color_val))
        (*put_color_table) (color_table, beg, chars_per_pixel, color_val);
 
@@ -7846,7 +7850,6 @@
   int width, height;
   XImagePtr ximg;
   TimeValue time;
-  struct gcpro gcpro1;
   int ino;
   CGrafPtr old_port;
   GDHandle old_gdh;