diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2014-10-07 20:18:07 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-10-07 20:18:07 +0300 |
| commit | 8ca8fde8a2f94e9446efc5aa68020c0badeecb4d (patch) | |
| tree | 683b09b987096c460f324a7603ecccbe8a219f3c /src/decompress.c | |
| parent | 5bdd495965548f6b754f204080f4f1e6bec622ed (diff) | |
| download | emacs-8ca8fde8a2f94e9446efc5aa68020c0badeecb4d.tar.gz | |
Fix bug #18650 with warning about zlib when loading url-vars.el.
src/decompress.c (init_zlib_functions): Move the message about zlib
being unavailable from here...
(Fzlib_decompress_region): ...to here.
lisp/url/url-http.el (url-http-create-request): Recheck zlib availability
on windows-nt each time it might be required.
Diffstat (limited to 'src/decompress.c')
| -rw-r--r-- | src/decompress.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/decompress.c b/src/decompress.c index cd8a3d1e962..24ce852245c 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -60,10 +60,7 @@ init_zlib_functions (void) HMODULE library = w32_delayed_load (Qzlib_dll); if (!library) - { - message1 ("zlib library not found"); - return false; - } + return false; LOAD_ZLIB_FN (library, inflateInit2_); LOAD_ZLIB_FN (library, inflate); @@ -150,7 +147,10 @@ This function can be called only in unibyte buffers. */) if (!zlib_initialized) zlib_initialized = init_zlib_functions (); if (!zlib_initialized) - return Qnil; + { + message1 ("zlib library not found"); + return Qnil; + } #endif /* This is a unibyte buffer, so character positions and bytes are |