Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1048

3 files changed, 10 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc138506d79..3e20def85e3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-03  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-03  Michael Albinus  <michael.albinus@gmx.de>
 
         * ediff-util.el (ediff-compute-custom-diffs-maybe): Handle remote
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6cadea3beb7..fd659b8a2db 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -108,7 +108,7 @@
 2008-02-01  Dave Love  <fx@gnu.org>
 
         * mm-util.el (mm-mule4-p, mm-enable-multibyte-mule4)
-        (mm-disable-multibyte-mule4)    
+        (mm-disable-multibyte-mule4)
         (mm-with-unibyte-current-buffer-mule4): Deleted.
 
         * gnus-sum.el (gnus-summary-mode, gnus-summary-display-article)
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index a9bd19f9a3d..62fd6edd919 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1111,7 +1111,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")