Mercurial > emacs

diff lisp/term/w32-win.el @ 91507:5f89bbfccdc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1048
author Miles Bader <miles@gnu.org>
date Mon, 04 Feb 2008 09:39:04 +0000
parents f38e85dfd4e3 4c9e3f8637a0
children f3ab0c2464f5
line wrap: on
line diff
--- a/lisp/term/w32-win.el	Mon Feb 04 09:38:49 2008 +0000
+++ b/lisp/term/w32-win.el	Mon Feb 04 09:39:04 2008 +0000
@@ -1111,7 +1111,9 @@
 ;;; Set default known names for image libraries
 (setq image-library-alist
       '((xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll")
-        (png "libpng13d.dll" "libpng13.dll" "libpng12d.dll" "libpng12.dll" "libpng.dll")
+        (png "libpng12d.dll" "libpng12.dll" "libpng.dll"
+	 ;; these are libpng 1.2.8 from GTK+
+	 "libpng13d.dll" "libpng13.dll")
         (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll")
         (tiff "libtiff3.dll" "libtiff.dll")
         (gif "giflib4.dll" "libungif4.dll" "libungif.dll")