From 3d4cad2cc94097362389a8ff35c404a87bd38581 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 2 Jan 2011 23:58:13 +0200 Subject: [PATCH] Fix merge of fix for bug #7716. nt/INSTALL: nt/README.W32: `image-library-alist' was renamed to `dynamic-library-alist'. --- nt/ChangeLog | 2 ++ nt/INSTALL | 4 ++-- nt/README.W32 | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index dffae55ba9..31aa081af9 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -6,6 +6,8 @@ * INSTALL: Update the information about PNG support libraries. (Bug#7716) + * README.W32: Update the information about PNG support libraries. + 2010-11-23 Eli Zaretskii * config.nt (EXTERNALLY_VISIBLE): Define. diff --git a/nt/INSTALL b/nt/INSTALL index da7ad5647e..ada4b6a8bb 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -299,12 +299,12 @@ earlier versions, so Emacs will only look for libpng libraries which are compatible with the version it was compiled against. That version is given by the value of the Lisp variable `libpng-version'; - e.g., 10403 means version 1.4.3. The variable `image-library-alist' + e.g., 10403 means version 1.4.3. The variable `dynamic-library-alist' is automatically set to name only those DLL names that are known to be compatible with the version given by `libpng-version'. If PNG support does not work for you even though you have the support DLL installed, check the name of the installed DLL against - `image-library-alist' and the value of `libpng-version', and + `dynamic-library-alist' and the value of `libpng-version', and download compatible DLLs if needed. * Experimental SVG support diff --git a/nt/README.W32 b/nt/README.W32 index 808b77e29d..ffe9b9ea9f 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -140,7 +140,7 @@ See the end of the file for license conditions. called giflib4.dll, libungif4.dll or libungif.dll. If you have image support DLLs under different names, customize the - value of `image-library-alist'. + value of `dynamic-library-alist'. In addition, Emacs can be compiled to support SVG. This precompiled distribution has not been compiled that way, since the SVG library -- 2.20.1