(image-library-alist): Prefer libpng12 to libpng13, because

the latter is in fact a 1.2.8 build distributed with GTK+
(as of today, the most recent libpng is 1.2.24).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f0466908138f46c38bb867ab908c07c84a1236e..e0d56c2a637b2c752560f6dfc39526d52a7121ef 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-01  Juanma Barranquero  <lekktu@gmail.com>
+
+       * term/w32-win.el (image-library-alist): Prefer libpng12 to libpng13,
+       because the latter is in fact a 1.2.8 build distributed with GTK+ (as
+       of today, the most recent libpng is 1.2.24).
+
 2008-02-01  Thien-Thi Nguyen  <ttn@gnuvola.org>
 
        * vc.el (vc-update): Fix bug: Specify branch tip as
@@ -23,7 +29,7 @@
 2008-01-31  Martin Rudalics  <rudalics@gmx.at>
 
        * mail/rmail.el (rmail-highlight): Fix specification.
-       Reported by: pod <pod@herald.ox.ac.uk>.
+       Reported by pod <pod@herald.ox.ac.uk>.
 
 2008-01-31  Jason Rumney  <jasonr@gnu.org>
 

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index d9a87e350793d7368442f33ac9dc5389a64da5ef..0ba22896dafefe23daaf3f95dddaee373dfe0fba 100644 (file)
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1254,7 +1254,9 @@ pop-up menu are unaffected by `w32-list-proportional-fonts')."
 ;;; 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")))