[Emacs-diffs] /srv/bzr/emacs/trunk r104186: src/image.c (Finit_image_library): Return t for built-in image types (bug#8640).

[Juanma Barranquero]

------------------------------------------------------------
revno: 104186
fixes bug(s): http://debbugs.gnu.org/8640
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2011-05-10 12:31:33 +0200
message:
  src/image.c (Finit_image_library): Return t for built-in image types 
(bug#8640).
modified:
  src/ChangeLog
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-05-09 11:29:51 +0000
+++ b/src/ChangeLog     2011-05-10 10:31:33 +0000
@@ -1,3 +1,8 @@
+2011-05-10  Juanma Barranquero  <address@hidden>
+
+       * image.c (Finit_image_library): Return t for built-in image types,
+       like pbm and xbm.  (Bug#8640)
+
 2011-05-09  Andreas Schwab  <address@hidden>
 
        * w32menu.c (set_frame_menubar): Fix submenu allocation.

=== modified file 'src/image.c'
--- a/src/image.c       2011-05-06 06:30:56 +0000
+++ b/src/image.c       2011-05-10 10:31:33 +0000
@@ -8609,6 +8609,10 @@
     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 @@
 
 #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