aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2013-08-13 19:20:39 +0300
committerEli Zaretskii2013-08-13 19:20:39 +0300
commit866c710eeb75ce47767442952028d79b76c1606a (patch)
treeb63e2e6a2a247b7d5234045a2c477bb13af4e9f1 /src
parent96311be7a6d096a22574caceab652a04f918d479 (diff)
downloademacs-866c710eeb75ce47767442952028d79b76c1606a.tar.gz
emacs-866c710eeb75ce47767442952028d79b76c1606a.zip
Fail zlib-decompress-region if loading zlib on Windows failed.
src/decompress.c (Fzlib_decompress_region) [WINDOWSNT]: Return Qnil if loading zlib failed.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/decompress.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 70a1fa28db5..1cb8002ccf7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-08-13 Eli Zaretskii <eliz@gnu.org>
2
3 * decompress.c (Fzlib_decompress_region) [WINDOWSNT]: Return Qnil
4 if loading zlib failed.
5
12013-08-13 Jan Djärv <jan.h.d@swipnet.se> 62013-08-13 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * nsterm.m (ns_set_vertical_scroll_bar): Fix breakage intruduced by 8 * nsterm.m (ns_set_vertical_scroll_bar): Fix breakage intruduced by
diff --git a/src/decompress.c b/src/decompress.c
index b7cd8a6c404..452a9210402 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -146,6 +146,8 @@ This function can be called only in unibyte buffers. */)
146#ifdef WINDOWSNT 146#ifdef WINDOWSNT
147 if (!zlib_initialized) 147 if (!zlib_initialized)
148 zlib_initialized = init_zlib_functions (); 148 zlib_initialized = init_zlib_functions ();
149 if (!zlib_initialized)
150 return Qnil;
149#endif 151#endif
150 152
151 /* This is a unibyte buffer, so character positions and bytes are 153 /* This is a unibyte buffer, so character positions and bytes are