[Emacs-diffs] Changes to emacs/src/image.c

[Richard M . Stallman]

Index: emacs/src/image.c
diff -c emacs/src/image.c:1.31 emacs/src/image.c:1.32
*** emacs/src/image.c:1.31      Thu Aug 11 13:58:12 2005
--- emacs/src/image.c   Mon Aug 15 01:47:01 2005
***************
*** 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.
  
--- 8038,8043 ----
***************
*** 8058,8063 ****
--- 8055,8071 ----
    Vimage_type_cache = Qnil;
    staticpro (&Vimage_type_cache);
  
+   Qpbm = intern ("pbm");
+   staticpro (&Qpbm);
+   ADD_IMAGE_TYPE(Qpbm);
+ 
+   Qxbm = intern ("xbm");
+   staticpro (&Qxbm);
+   ADD_IMAGE_TYPE(Qxbm);
+ 
+   define_image_type (&xbm_type, 1);
+   define_image_type (&pbm_type, 1);
+ 
    QCascent = intern (":ascent");
    staticpro (&QCascent);
    QCmargin = intern (":margin");
***************
*** 8101,8114 ****
    QCpt_height = intern (":pt-height");
    staticpro (&QCpt_height);
  #endif /* HAVE_GHOSTSCRIPT */
- 
-   Qpbm = intern ("pbm");
-   staticpro (&Qpbm);
-   ADD_IMAGE_TYPE(Qpbm);
- 
-   Qxbm = intern ("xbm");
-   staticpro (&Qxbm);
-   ADD_IMAGE_TYPE(Qxbm);
  
  #if defined (HAVE_XPM) || defined (MAC_OS)
    Qxpm = intern ("xpm");
--- 8109,8114 ----