merge from trunk

2 files changed, 8 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 013e181c406..7a875ae63bc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * decompress.c (Fzlib_available_p) [WINDOWSNT]: Update the value
+        of zlib_initialized according to the results of calling
+        init_zlib_functions.
+
 2013-08-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * image.c: Implement an ImageMagick per-image cache.
diff --git a/src/decompress.c b/src/decompress.c
index 0212354fc8f..c49f39a8ba1 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -116,7 +116,8 @@ DEFUN ("zlib-available-p", Fzlib_available_p, Szlib_available_p, 0, 0, 0,
   else
     {
       Lisp_Object status;
-      status = init_zlib_functions () ? Qt : Qnil;
+      zlib_initialized = init_zlib_functions ();
+      status = zlib_initialized ? Qt : Qnil;
       Vlibrary_cache = Fcons (Fcons (Qzlib_dll, status), Vlibrary_cache);
       return status;
     }