[Emacs-diffs] trunk r118070: Fix bug #18650 with warning about zlib when loading url-vars.el.

[Eli Zaretskii]

------------------------------------------------------------
revno: 118070
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18650
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2014-10-07 20:18:07 +0300
message:
  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.
modified:
  lisp/url/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-3116
  lisp/url/url-http.el           urlhttp.el-20091113204419-o5vbwnq5f7feedwu-2989
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/decompress.c               decompress.c-20130811194033-wfhl0tqmmc36jfmu-1

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2014-09-28 18:00:54 +0000
+++ b/lisp/url/ChangeLog        2014-10-07 17:18:07 +0000
@@ -1,3 +1,8 @@
+2014-10-07  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * url-gw.el (url-open-stream): New optional parameter

=== modified file 'lisp/url/url-http.el'
--- a/lisp/url/url-http.el      2014-09-28 18:00:54 +0000
+++ b/lisp/url/url-http.el      2014-10-07 17:18:07 +0000
@@ -313,7 +313,14 @@
                  (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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-10-07 16:00:35 +0000
+++ b/src/ChangeLog     2014-10-07 17:18:07 +0000
@@ -1,3 +1,9 @@
+2014-10-07  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * font.c (Ffont_get_glyphs): Use validate_subarray and fix

=== modified file 'src/decompress.c'
--- a/src/decompress.c  2014-01-01 07:43:34 +0000
+++ b/src/decompress.c  2014-10-07 17:18:07 +0000
@@ -60,10 +60,7 @@
   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 @@
   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