Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 285-296)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: admin/FOR-RELEASE: Update refcard section.

 * gnus--rel--5.10  (patch 102-104)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64

1 files changed, 6 insertions, 7 deletions

diff --git a/src/image.c b/src/image.c
index f309a401139..70ffabc1937 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6104,7 +6104,6 @@ png_load (f, img)
         {
           image_error ("Cannot open image file `%s'", file, Qnil);
           UNGCPRO;
-          fclose (fp);
           return 0;
         }
 
@@ -8067,18 +8066,18 @@ gif_load (f, img)
   /* Save GIF image extension data for `image-extension-data'.
      Format is (count IMAGES 0xf9 GRAPHIC_CONTROL_EXTENSION_BLOCK).  */
   {
-    unsigned char gce[4];
+    Lisp_Object gce = make_uninit_string (4);
     int centisec = ((float)duration / time_scale) * 100.0f + 0.5f;
 
     /* Fill the delay time field.  */
-    gce[1] = centisec & 0xff;
-    gce[2] = (centisec >> 8) & 0xff;
+    SSET (gce, 1, centisec & 0xff);
+    SSET (gce, 2, (centisec >> 8) & 0xff);
     /* We don't know about other fields.  */
-    gce[0] = gce[3] = 0;
+    SSET (gce, 0, 0);
+    SSET (gce, 3, 0);
 
     img->data.lisp_val = list4 (Qcount, make_number (nsamples),
-                                make_number (0xf9),
-                                make_unibyte_string (gce, 4));
+                                make_number (0xf9), gce);
   }
 
   /* Maybe fill in the background field while we have ximg handy. */