Mercurial > emacs
comparison lisp/term/w32-win.el @ 91507:5f89bbfccdc3
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1048
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 04 Feb 2008 09:39:04 +0000 |
| parents | f38e85dfd4e3 4c9e3f8637a0 |
| children | f3ab0c2464f5 |
comparison
equal
deleted
inserted
replaced
| 91506:ab078721fd90 | 91507:5f89bbfccdc3 |
|---|---|
| 1109 (error "Font not found"))))) | 1109 (error "Font not found"))))) |
| 1110 | 1110 |
| 1111 ;;; Set default known names for image libraries | 1111 ;;; Set default known names for image libraries |
| 1112 (setq image-library-alist | 1112 (setq image-library-alist |
| 1113 '((xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll") | 1113 '((xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll") |
| 1114 (png "libpng13d.dll" "libpng13.dll" "libpng12d.dll" "libpng12.dll" "libpng.dll") | 1114 (png "libpng12d.dll" "libpng12.dll" "libpng.dll" |
| 1115 ;; these are libpng 1.2.8 from GTK+ | |
| 1116 "libpng13d.dll" "libpng13.dll") | |
| 1115 (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll") | 1117 (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll") |
| 1116 (tiff "libtiff3.dll" "libtiff.dll") | 1118 (tiff "libtiff3.dll" "libtiff.dll") |
| 1117 (gif "giflib4.dll" "libungif4.dll" "libungif.dll") | 1119 (gif "giflib4.dll" "libungif4.dll" "libungif.dll") |
| 1118 (svg "librsvg-2-2.dll") | 1120 (svg "librsvg-2-2.dll") |
| 1119 (gdk-pixbuf "libgdk_pixbuf-2.0-0.dll") | 1121 (gdk-pixbuf "libgdk_pixbuf-2.0-0.dll") |