Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-667
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-668
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-669
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-670
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-157
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-158
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-159
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-160
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-161
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-162
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-163
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-164
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-165
   Update from CVS: texi/message.texi: Fix default values.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-166
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-167
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-168
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-448

1 files changed, 4 insertions, 6 deletions

diff --git a/src/image.c b/src/image.c
index d020b2ac394..8a6d40ae34f 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7778,6 +7778,9 @@ gif_load (f, img)
   specified_file = image_spec_value (img->spec, QCfile, NULL);
   specified_data = image_spec_value (img->spec, QCdata, NULL);
 
+  /* Animated gifs use QuickTime Movie Toolbox.  So initialize it here. */
+  EnterMovies ();
+
   if (NILP (specified_data))
     {
       /* Read from a file */
@@ -8500,14 +8503,9 @@ meaning don't clear the cache.  */);
 void
 init_image ()
 {
-#ifdef MAC_OS
-  /* Animated gifs use QuickTime Movie Toolbox.  So initialize it here. */
-  if (!inhibit_window_system)
-    EnterMovies ();
-#ifdef MAC_OSX
+#if defined (MAC_OSX) && TARGET_API_MAC_CARBON
   init_image_func_pointer ();
 #endif
-#endif
 }
 
 /* arch-tag: 123c2a5e-14a8-4c53-ab95-af47d7db49b9