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

Fix bug #18650 with warning about zlib when loading url-vars.el.

Browse source 
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.
This commit is contained in:
Eli Zaretskii 2014-10-07 20:18:07 +03:00
parent 5bdd495965
commit 8ca8fde8a2
4 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/url/ChangeLog
View file

@ -1,3 +1,8 @@
2014-10-07 Eli Zaretskii <eliz@gnu.org>
* url-http.el (url-http-create-request): Recheck zlib availability
on windows-nt each time it might be required. (Bug#18650)
2014-09-28 Ulf Jasper <ulf.jasper@web.de>
* url-gw.el (url-open-stream): New optional parameter

9
lisp/url/url-http.el
View file

@ -313,7 +313,14 @@ request.")
(concat
"From: " url-personal-mail-address "\r\n"))
;; Encodings we understand
(if url-mime-encoding-string
(if (or url-mime-encoding-string
;; MS-Windows loads zlib dynamically, so recheck
;; in case they made it available since
;; initialization in url-vars.el.
(and (eq 'system-type 'windows-nt)
(fboundp 'zlib-available-p)
(zlib-available-p)
(setq url-mime-encoding-string "gzip")))
(concat
"Accept-encoding: " url-mime-encoding-string "\r\n"))
(if url-mime-charset-string

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2014-10-07 Eli Zaretskii <eliz@gnu.org>
* decompress.c (init_zlib_functions): Move the message about zlib
being unavailable from here...
(Fzlib_decompress_region): ...to here. (Bug#18650)
2014-10-07 Dmitry Antipov <dmantipov@yandex.ru>
* font.c (Ffont_get_glyphs): Use validate_subarray and fix

10
src/decompress.c
View file

@ -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