Merge from emacs-24

[gnu-emacs] / src / image.c

diff --git a/src/image.c b/src/image.c
index 57f9b7735b6f9ed730955bf5e2bb3b595c4c2af4..4b73a5fe80cded38edda9f2b0d6cb1d3b1625e0e 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -8231,6 +8231,12 @@ imagemagick_load_image (struct frame *f, struct image *img,
       return 0;
     }
 
+  if (MagickGetImageDelay (image_wand) > 0)
+    img->lisp_data =
+      Fcons (Qdelay,
+             Fcons (make_float (MagickGetImageDelay (image_wand) / 100.0),
+                    img->lisp_data));
+
   if (MagickGetNumberImages (image_wand) > 1)
     img->lisp_data =
       Fcons (Qcount,