diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/term/w32-win.el | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4f046690813..e0d56c2a637 100644 --- 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 d9a87e35079..0ba22896daf 100644 --- 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"))) |