summaryrefslogtreecommitdiff
path: root/lisp/term
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2008-02-01 15:19:59 +0000
committerJuanma Barranquero <lekktu@gmail.com>2008-02-01 15:19:59 +0000
commit299db7f8cf9dc51097b74cb0aef3b0f03220b058 (patch)
tree90f2d1d0db6c75aaf6fa2ffb3c002fe0bcb4eab4 /lisp/term
parenteaf07ced98808b82c0db7fc75a91c1c791fe6206 (diff)
downloademacs-299db7f8cf9dc51097b74cb0aef3b0f03220b058.tar.gz
emacs-299db7f8cf9dc51097b74cb0aef3b0f03220b058.tar.bz2
emacs-299db7f8cf9dc51097b74cb0aef3b0f03220b058.zip
(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).
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/w32-win.el4
1 files changed, 3 insertions, 1 deletions
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")))