(image-library-alist): Initialize to a known set of probable library names.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 055bb70de3b128d6b3e6d33a558d66fffc751fa4..8ab0e958defc61cc06d57a0edc8c6171487747b1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2004-06-14  Juanma Barranquero  <lektu@terra.es>
+
+       * image.el (image-library-alist): New variable to map image types
+       to external libraries.  Initialized to nil, unless system-specific
+       configs change it.
+       (image-type-available-p): Determine whether an image type is
+       available by calling `init-image-library'.
+
+       * term/w32-win.el (image-library-alist): Initialize to a known set
+       of probable library names.
+
 2004-06-14  Kenichi Handa  <handa@m17n.org>
 
        * international/code-pages.el (windows-1256, cp1125): Fix tables

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 8e0283222bc2f61c97cc25448c044b02cdc7a8e0..cea1d3f77b8873f0ba5a877d66d5f610250de276 100644 (file)
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1,6 +1,6 @@
 ;;; w32-win.el --- parse switches controlling interface with W32 window system
 
-;; Copyright (C) 1993, 1994, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2003, 2004 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallo
 ;; Keywords: terminals
@@ -1261,5 +1261,13 @@ font dialog to get the matching FONTS. Otherwise use a pop-up menu
        (if (null font)
            (error "Font not found")))))
 
+;;; Set default known names for image libraries
+(setq image-library-alist
+      '((xpm "libXpm-nox4.dll" "libxpm.dll")
+        (png "libpng13d.dll" "libpng13.dll" "libpng12d.dll" "libpng12.dll" "libpng.dll")
+        (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll")
+        (tiff "libtiff3.dll" "libtiff.dll")
+        (gif "libungif.dll")))
+
 ;;; arch-tag: 69fb1701-28c2-4890-b351-3d1fe4b4f166
 ;;; w32-win.el ends here