Mercurial > emacs
changeset 64910:eef3e25f6aed
(syms_of_image): Init image_types here, and call define_image_type.
(init_image): Not here.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Thu, 11 Aug 2005 13:58:12 +0000 |
| parents | 777c4aaf636a |
| children | 08a222d72566 |
| files | src/image.c |
| diffstat | 1 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/image.c Thu Aug 11 13:31:36 2005 +0000 +++ b/src/image.c Thu Aug 11 13:58:12 2005 +0000 @@ -8025,6 +8025,11 @@ { 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,6 +8038,9 @@ 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,11 +8171,6 @@ 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 ();