summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2004-06-14 21:01:37 +0000
committerJuanma Barranquero <lekktu@gmail.com>2004-06-14 21:01:37 +0000
commitfe34703418bc6b49b420ed30f48ad8abeaf4bc76 (patch)
tree0570209d5db5ed4fd50d311f56f8050641726566 /lisp
parent3c3b34d2dbbf7d8e334611172cd58ff5d2e765b4 (diff)
downloademacs-fe34703418bc6b49b420ed30f48ad8abeaf4bc76.tar.gz
emacs-fe34703418bc6b49b420ed30f48ad8abeaf4bc76.tar.bz2
emacs-fe34703418bc6b49b420ed30f48ad8abeaf4bc76.zip
(image-library-alist): Initialize to a known set of probable library names.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/term/w32-win.el10
2 files changed, 20 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 055bb70de3b..8ab0e958def 100644
--- 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 8e0283222bc..cea1d3f77b8 100644
--- 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