procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fail zlib-decompress-region if loading zlib on Windows failed.

Browse source 
src/decompress.c (Fzlib_decompress_region) [WINDOWSNT]: Return Qnil
 if loading zlib failed.
This commit is contained in:
Eli Zaretskii 2013-08-13 19:20:39 +03:00
parent 96311be7a6
commit 866c710eeb
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2013-08-13 Eli Zaretskii <eliz@gnu.org>
* decompress.c (Fzlib_decompress_region) [WINDOWSNT]: Return Qnil
if loading zlib failed.
2013-08-13 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (ns_set_vertical_scroll_bar): Fix breakage intruduced by

2
src/decompress.c
View file

@ -146,6 +146,8 @@ This function can be called only in unibyte buffers. */)
#ifdef WINDOWSNT
if (!zlib_initialized)
zlib_initialized = init_zlib_functions ();
if (!zlib_initialized)
return Qnil;
#endif
/* This is a unibyte buffer, so character positions and bytes are