# HG changeset patch # User Eli Zaretskii # Date 1294005493 -7200 # Node ID cb7f7a583491a8f88b2aeb2cad1bc0af4b1effc5 # Parent a71f37cebb551c637b4793da1e049d567eaf1349 Fix merge of fix for bug #7716. nt/INSTALL: nt/README.W32: `image-library-alist' was renamed to `dynamic-library-alist'. diff -r a71f37cebb55 -r cb7f7a583491 nt/ChangeLog --- a/nt/ChangeLog Sun Jan 02 15:31:19 2011 -0500 +++ b/nt/ChangeLog Sun Jan 02 23:58:13 2011 +0200 @@ -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 -r a71f37cebb55 -r cb7f7a583491 nt/INSTALL --- a/nt/INSTALL Sun Jan 02 15:31:19 2011 -0500 +++ b/nt/INSTALL Sun Jan 02 23:58:13 2011 +0200 @@ -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 -r a71f37cebb55 -r cb7f7a583491 nt/README.W32 --- a/nt/README.W32 Sun Jan 02 15:31:19 2011 -0500 +++ b/nt/README.W32 Sun Jan 02 23:58:13 2011 +0200 @@ -140,7 +140,7 @@ 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