aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2005-08-15 01:47:01 +0000
committerRichard M. Stallman2005-08-15 01:47:01 +0000
commit7c4e3a3219dd2145393ca01cb31a45a4a433e147 (patch)
tree4bf6973a8768b349962e42f140916df8e0442d66 /src
parenteda12ca365dd38aa6c61dacd2bd9f6cad3f6d5f8 (diff)
downloademacs-7c4e3a3219dd2145393ca01cb31a45a4a433e147.tar.gz
emacs-7c4e3a3219dd2145393ca01cb31a45a4a433e147.zip
(syms_of_image): Init Qxbm, Qpbm before calling define_image_type.
Diffstat (limited to 'src')
-rw-r--r--src/image.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/image.c b/src/image.c
index dfe592f3c14..3e8a62801b0 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8038,9 +8038,6 @@ Each element of the list is a symbol for a image type, like 'jpeg or 'png.
8038To check whether it is really supported, use `image-type-available-p'. */); 8038To check whether it is really supported, use `image-type-available-p'. */);
8039 Vimage_types = Qnil; 8039 Vimage_types = Qnil;
8040 8040
8041 define_image_type (&xbm_type, 1);
8042 define_image_type (&pbm_type, 1);
8043
8044 DEFVAR_LISP ("image-library-alist", &Vimage_library_alist, 8041 DEFVAR_LISP ("image-library-alist", &Vimage_library_alist,
8045 doc: /* Alist of image types vs external libraries needed to display them. 8042 doc: /* Alist of image types vs external libraries needed to display them.
8046 8043
@@ -8058,6 +8055,17 @@ listed; they're always supported. */);
8058 Vimage_type_cache = Qnil; 8055 Vimage_type_cache = Qnil;
8059 staticpro (&Vimage_type_cache); 8056 staticpro (&Vimage_type_cache);
8060 8057
8058 Qpbm = intern ("pbm");
8059 staticpro (&Qpbm);
8060 ADD_IMAGE_TYPE(Qpbm);
8061
8062 Qxbm = intern ("xbm");
8063 staticpro (&Qxbm);
8064 ADD_IMAGE_TYPE(Qxbm);
8065
8066 define_image_type (&xbm_type, 1);
8067 define_image_type (&pbm_type, 1);
8068
8061 QCascent = intern (":ascent"); 8069 QCascent = intern (":ascent");
8062 staticpro (&QCascent); 8070 staticpro (&QCascent);
8063 QCmargin = intern (":margin"); 8071 QCmargin = intern (":margin");
@@ -8102,14 +8110,6 @@ listed; they're always supported. */);
8102 staticpro (&QCpt_height); 8110 staticpro (&QCpt_height);
8103#endif /* HAVE_GHOSTSCRIPT */ 8111#endif /* HAVE_GHOSTSCRIPT */
8104 8112
8105 Qpbm = intern ("pbm");
8106 staticpro (&Qpbm);
8107 ADD_IMAGE_TYPE(Qpbm);
8108
8109 Qxbm = intern ("xbm");
8110 staticpro (&Qxbm);
8111 ADD_IMAGE_TYPE(Qxbm);
8112
8113#if defined (HAVE_XPM) || defined (MAC_OS) 8113#if defined (HAVE_XPM) || defined (MAC_OS)
8114 Qxpm = intern ("xpm"); 8114 Qxpm = intern ("xpm");
8115 staticpro (&Qxpm); 8115 staticpro (&Qxpm);