Rename `zlib-decompress-gzipped-region' to `zlib-decompress-region'.

Also support zlib-format compression.

3 files changed, 6 insertions, 3 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 7ac445e03c1..2346803c6bf 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -3,6 +3,8 @@
         * url-http.el (url-handle-content-transfer-encoding): Renamed
         `zlib-decompress-gzipped-region' and check whether it's available,
         too.
+        (url-handle-content-transfer-encoding): Renamed
+        `zlib-decompress-region' again.
 
 2013-08-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 9eab1a6f683..07049591cf0 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -860,14 +860,14 @@ should be shown to the user."
 (defun url-handle-content-transfer-encoding ()
   (let ((encoding (mail-fetch-field "content-encoding")))
     (when (and encoding
-               (fboundp 'zlib-decompress-gzipped-region)
+               (fboundp 'zlib-decompress-region)
                (zlib-available-p)
                (equal (downcase encoding) "gzip"))
       (save-restriction
         (widen)
         (goto-char (point-min))
         (when (search-forward "\n\n")
-          (zlib-decompress-gzipped-region (point) (point-max)))))))
+          (zlib-decompress-region (point) (point-max)))))))
 
 ;; Miscellaneous
 (defun url-http-activate-callback ()
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 786b5533bf8..0361e01dfb4 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -210,7 +210,8 @@ Should be an assoc list of headers/contents.")
 
 (defvar url-request-method nil "The method to use for the next request.")
 
-(defvar url-mime-encoding-string (and (fboundp 'zlib-decompress-gzipped-region)
+(defvar url-mime-encoding-string (and (fboundp 'zlib-decompress-region)
+                                      (zlib-available-p)
                                       "gzip")
   "String to send in the Accept-encoding: field in HTTP requests.")