merge from trunk

4 files changed, 12 insertions, 2 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 723dc0cbedf..7618736ee4f 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -7,6 +7,7 @@
         (Filling): Add cross-reference for hard newlines.
         (Sorting): Fix indentation.
         (Columns): Comment out undefined behavior.
+        (Case Changes): Fix an `args-out-of-range' error in the example.
 
 2013-08-16  Xue Fuqiao  <xfq.free@gmail.com>
 
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 38b0136de2e..385b0f95c44 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -2354,6 +2354,8 @@ code.
 For example, if @var{count} is 3, this command adds 3 columns of
 indentation to each of the lines beginning in the region specified.
 
+@c FIXME: I suggest using message-indent-citation as the example, or
+@c just remove this paragraph.  --xfq
 In Mail mode, @kbd{C-c C-y} (@code{mail-yank-original}) uses
 @code{indent-rigidly} to indent the text copied from the message being
 replied to.
@@ -2531,7 +2533,7 @@ This is the contents of the 5th foo.
 @end group
 
 @group
-(capitalize-region 1 44)
+(capitalize-region 1 37)
 @result{} nil
 
 ---------- Buffer: foo ----------
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;
     }