[Emacs-diffs] /srv/bzr/emacs/trunk r102738: Fix merge of fix for bug #7716.

[Eli Zaretskii]

------------------------------------------------------------
revno: 102738
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2011-01-02 23:58:13 +0200
message:
  Fix merge of fix for bug #7716.
  
   nt/INSTALL:
   nt/README.W32: `image-library-alist' was renamed to `dynamic-library-alist'.
modified:
  nt/ChangeLog
  nt/INSTALL
  nt/README.W32

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2011-01-02 20:28:40 +0000
+++ b/nt/ChangeLog      2011-01-02 21:58:13 +0000
@@ -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  <address@hidden>
 
        * config.nt (EXTERNALLY_VISIBLE): Define.

=== modified file 'nt/INSTALL'
--- a/nt/INSTALL        2011-01-02 20:28:40 +0000
+++ b/nt/INSTALL        2011-01-02 21:58:13 +0000
@@ -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

=== modified file 'nt/README.W32'
--- a/nt/README.W32     2011-01-02 20:28:40 +0000
+++ b/nt/README.W32     2011-01-02 21:58:13 +0000
@@ -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