procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

src/image.c (Finit_image_library): Return t for built-in image types (bug#8640).

Browse source
This commit is contained in:
Juanma Barranquero 2011-05-10 12:31:33 +02:00
parent b8bd6c8db8
commit 2f142cc515
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2011-05-10 Juanma Barranquero <lekktu@gmail.com>
* image.c (Finit_image_library): Return t for built-in image types,
like pbm and xbm. (Bug#8640)
2011-05-09 Andreas Schwab <schwab@linux-m68k.org>
* w32menu.c (set_frame_menubar): Fix submenu allocation.

10
src/image.c
View file

@ -8609,6 +8609,10 @@ of `dynamic-library-alist', which see). */)
return XCDR (tested);
#endif
/* Types pbm and xbm are built-in and always available. */
if (EQ (type, Qpbm) || EQ (type, Qxbm))
return Qt;
#if defined (HAVE_XPM) || defined (HAVE_NS)
if (EQ (type, Qxpm))
return CHECK_LIB_AVAILABLE (&xpm_type, init_xpm_functions, libraries);
@ -8641,10 +8645,8 @@ of `dynamic-library-alist', which see). */)
#if defined (HAVE_IMAGEMAGICK)
if (EQ (type, Qimagemagick))
{
return CHECK_LIB_AVAILABLE (&imagemagick_type, init_imagemagick_functions,
libraries);
}
return CHECK_LIB_AVAILABLE (&imagemagick_type, init_imagemagick_functions,
libraries);
#endif
#ifdef HAVE_GHOSTSCRIPT