diff options
| author | Miles Bader <miles@gnu.org> | 2008-02-04 09:39:04 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-02-04 09:39:04 +0000 |
| commit | 093571c374d671607c822dd2e5bedb2ac877ea91 (patch) | |
| tree | 2b912b5ab8966dd0710fcbfcfaa9fc305895d078 /lisp/term/w32-win.el | |
| parent | e9198520f3a0c0ef88a77179bc89e3714d58e69f (diff) | |
| parent | 8e7e5143d9d3c4625846f58a905d4d6fc2c424ef (diff) | |
| download | emacs-093571c374d671607c822dd2e5bedb2ac877ea91.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1048
Diffstat (limited to 'lisp/term/w32-win.el')
| -rw-r--r-- | lisp/term/w32-win.el | 4 |
1 files changed, 3 insertions, 1 deletions
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") |