aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2005-05-05 01:03:56 +0000
committerJuanma Barranquero2005-05-05 01:03:56 +0000
commitdc75b163941c2ef0d2ec770b80a2e48b1aa32503 (patch)
treed98e273caaf94842ff72ca5089e75cbbac1b67fb
parent187ccf4905035f9f953489d1612f9075c3074df5 (diff)
downloademacs-dc75b163941c2ef0d2ec770b80a2e48b1aa32503.tar.gz
emacs-dc75b163941c2ef0d2ec770b80a2e48b1aa32503.zip
(image-library-alist): Add additional name for Xpm library.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/term/w32-win.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8169e287e8..5dd89776aa2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12005-05-05 Juanma Barranquero <lekktu@gmail.com>
2
3 * term/w32-win.el (image-library-alist): Add additional name for
4 Xpm library.
5
12005-05-05 Nick Roberts <nickrob@snap.net.nz> 62005-05-05 Nick Roberts <nickrob@snap.net.nz>
2 7
3 * progmodes/cmacexp.el (c-macro-preprocessor): Update for BSD and 8 * progmodes/cmacexp.el (c-macro-preprocessor): Update for BSD and
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 862f3fe1d0a..ca3c0e2e963 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1223,7 +1223,7 @@ font dialog to get the matching FONTS. Otherwise use a pop-up menu
1223 1223
1224;;; Set default known names for image libraries 1224;;; Set default known names for image libraries
1225(setq image-library-alist 1225(setq image-library-alist
1226 '((xpm "libXpm-nox4.dll" "libxpm.dll") 1226 '((xpm "xpm4.dll" "libXpm-nox4.dll" "libxpm.dll")
1227 (png "libpng13d.dll" "libpng13.dll" "libpng12d.dll" "libpng12.dll" "libpng.dll") 1227 (png "libpng13d.dll" "libpng13.dll" "libpng12d.dll" "libpng12.dll" "libpng.dll")
1228 (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll") 1228 (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll")
1229 (tiff "libtiff3.dll" "libtiff.dll") 1229 (tiff "libtiff3.dll" "libtiff.dll")