aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/ChangeLog1
-rw-r--r--doc/lispref/text.texi4
-rw-r--r--src/ChangeLog6
-rw-r--r--src/decompress.c3
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 @@
7 (Filling): Add cross-reference for hard newlines. 7 (Filling): Add cross-reference for hard newlines.
8 (Sorting): Fix indentation. 8 (Sorting): Fix indentation.
9 (Columns): Comment out undefined behavior. 9 (Columns): Comment out undefined behavior.
10 (Case Changes): Fix an `args-out-of-range' error in the example.
10 11
112013-08-16 Xue Fuqiao <xfq.free@gmail.com> 122013-08-16 Xue Fuqiao <xfq.free@gmail.com>
12 13
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.
2354For example, if @var{count} is 3, this command adds 3 columns of 2354For example, if @var{count} is 3, this command adds 3 columns of
2355indentation to each of the lines beginning in the region specified. 2355indentation to each of the lines beginning in the region specified.
2356 2356
2357@c FIXME: I suggest using message-indent-citation as the example, or
2358@c just remove this paragraph. --xfq
2357In Mail mode, @kbd{C-c C-y} (@code{mail-yank-original}) uses 2359In Mail mode, @kbd{C-c C-y} (@code{mail-yank-original}) uses
2358@code{indent-rigidly} to indent the text copied from the message being 2360@code{indent-rigidly} to indent the text copied from the message being
2359replied to. 2361replied to.
@@ -2531,7 +2533,7 @@ This is the contents of the 5th foo.
2531@end group 2533@end group
2532 2534
2533@group 2535@group
2534(capitalize-region 1 44) 2536(capitalize-region 1 37)
2535@result{} nil 2537@result{} nil
2536 2538
2537---------- Buffer: foo ---------- 2539---------- Buffer: foo ----------
diff --git a/src/ChangeLog b/src/ChangeLog
index 013e181c406..7a875ae63bc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12013-08-17 Eli Zaretskii <eliz@gnu.org>
2
3 * decompress.c (Fzlib_available_p) [WINDOWSNT]: Update the value
4 of zlib_initialized according to the results of calling
5 init_zlib_functions.
6
12013-08-16 Lars Magne Ingebrigtsen <larsi@gnus.org> 72013-08-16 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 8
3 * image.c: Implement an ImageMagick per-image cache. 9 * 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,
116 else 116 else
117 { 117 {
118 Lisp_Object status; 118 Lisp_Object status;
119 status = init_zlib_functions () ? Qt : Qnil; 119 zlib_initialized = init_zlib_functions ();
120 status = zlib_initialized ? Qt : Qnil;
120 Vlibrary_cache = Fcons (Fcons (Qzlib_dll, status), Vlibrary_cache); 121 Vlibrary_cache = Fcons (Fcons (Qzlib_dll, status), Vlibrary_cache);
121 return status; 122 return status;
122 } 123 }