Index: emacs/src/image.c
diff -c emacs/src/image.c:1.30 emacs/src/image.c:1.31
*** emacs/src/image.c:1.30 Sun Aug 7 12:33:17 2005
--- emacs/src/image.c Thu Aug 11 13:58:12 2005
***************
*** 8025,8030 ****
--- 8025,8035 ----
{
extern Lisp_Object Qrisky_local_variable; /* Syms_of_xdisp has already
run. */
+ /* Initialize this only once, since that's what we do with Vimage_types
+ and they are supposed to be in sync. Initializing here gives correct
+ operation on GNU/Linux of calling dump-emacs after loading some images.
*/
+ image_types = NULL;
+
/* Must be defined now becase we're going to update it below, while
defining the supported image types. */
DEFVAR_LISP ("image-types", &Vimage_types,
***************
*** 8033,8038 ****
--- 8038,8046 ----
To check whether it is really supported, use `image-type-available-p'. */);
Vimage_types = Qnil;
+ define_image_type (&xbm_type, 1);
+ define_image_type (&pbm_type, 1);
+
DEFVAR_LISP ("image-library-alist", &Vimage_library_alist,
doc: /* Alist of image types vs external libraries needed to display them.
***************
*** 8163,8173 ****
void
init_image ()
{
- image_types = NULL;
-
- define_image_type (&xbm_type, 1);
- define_image_type (&pbm_type, 1);
-
#ifdef MAC_OS
/* Animated gifs use QuickTime Movie Toolbox. So initialize it here. */
EnterMovies ();
--- 8171,8176 ----
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
