diff options
| author | Eli Zaretskii | 2011-01-02 23:58:13 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-01-02 23:58:13 +0200 |
| commit | 3d4cad2cc94097362389a8ff35c404a87bd38581 (patch) | |
| tree | ba21239d9944255ff560ac1561b5ca97d812e3dd | |
| parent | 7c420169baa7c50428589cca7f8eda71b462eb15 (diff) | |
| download | emacs-3d4cad2cc94097362389a8ff35c404a87bd38581.tar.gz emacs-3d4cad2cc94097362389a8ff35c404a87bd38581.zip | |
Fix merge of fix for bug #7716.
nt/INSTALL:
nt/README.W32: `image-library-alist' was renamed to `dynamic-library-alist'.
| -rw-r--r-- | nt/ChangeLog | 2 | ||||
| -rw-r--r-- | nt/INSTALL | 4 | ||||
| -rw-r--r-- | nt/README.W32 | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index dffae55ba93..31aa081af9c 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -6,6 +6,8 @@ | |||
| 6 | * INSTALL: Update the information about PNG support libraries. | 6 | * INSTALL: Update the information about PNG support libraries. |
| 7 | (Bug#7716) | 7 | (Bug#7716) |
| 8 | 8 | ||
| 9 | * README.W32: Update the information about PNG support libraries. | ||
| 10 | |||
| 9 | 2010-11-23 Eli Zaretskii <eliz@gnu.org> | 11 | 2010-11-23 Eli Zaretskii <eliz@gnu.org> |
| 10 | 12 | ||
| 11 | * config.nt (EXTERNALLY_VISIBLE): Define. | 13 | * config.nt (EXTERNALLY_VISIBLE): Define. |
diff --git a/nt/INSTALL b/nt/INSTALL index da7ad5647ed..ada4b6a8bbe 100644 --- a/nt/INSTALL +++ b/nt/INSTALL | |||
| @@ -299,12 +299,12 @@ | |||
| 299 | earlier versions, so Emacs will only look for libpng libraries which | 299 | earlier versions, so Emacs will only look for libpng libraries which |
| 300 | are compatible with the version it was compiled against. That | 300 | are compatible with the version it was compiled against. That |
| 301 | version is given by the value of the Lisp variable `libpng-version'; | 301 | version is given by the value of the Lisp variable `libpng-version'; |
| 302 | e.g., 10403 means version 1.4.3. The variable `image-library-alist' | 302 | e.g., 10403 means version 1.4.3. The variable `dynamic-library-alist' |
| 303 | is automatically set to name only those DLL names that are known to | 303 | is automatically set to name only those DLL names that are known to |
| 304 | be compatible with the version given by `libpng-version'. If PNG | 304 | be compatible with the version given by `libpng-version'. If PNG |
| 305 | support does not work for you even though you have the support DLL | 305 | support does not work for you even though you have the support DLL |
| 306 | installed, check the name of the installed DLL against | 306 | installed, check the name of the installed DLL against |
| 307 | `image-library-alist' and the value of `libpng-version', and | 307 | `dynamic-library-alist' and the value of `libpng-version', and |
| 308 | download compatible DLLs if needed. | 308 | download compatible DLLs if needed. |
| 309 | 309 | ||
| 310 | * Experimental SVG support | 310 | * Experimental SVG support |
diff --git a/nt/README.W32 b/nt/README.W32 index 808b77e29d0..ffe9b9ea9f0 100644 --- a/nt/README.W32 +++ b/nt/README.W32 | |||
| @@ -140,7 +140,7 @@ See the end of the file for license conditions. | |||
| 140 | called giflib4.dll, libungif4.dll or libungif.dll. | 140 | called giflib4.dll, libungif4.dll or libungif.dll. |
| 141 | 141 | ||
| 142 | If you have image support DLLs under different names, customize the | 142 | If you have image support DLLs under different names, customize the |
| 143 | value of `image-library-alist'. | 143 | value of `dynamic-library-alist'. |
| 144 | 144 | ||
| 145 | In addition, Emacs can be compiled to support SVG. This precompiled | 145 | In addition, Emacs can be compiled to support SVG. This precompiled |
| 146 | distribution has not been compiled that way, since the SVG library | 146 | distribution has not been compiled that way, since the SVG library |