Add the zlib prefix to `decompress-gzipped-region'

etc/NEWS

@@ -43,7 +43,7 @@ no longer created during installation.
 
 ** Emacs can be compiled with zlib support.  If this library is present
 (which it normally is on most systems), the function
-`decompress-gzipped-region' becomes available.
+`zlib-decompress-gzipped-region' becomes available.
 
 ---
 ** Emacs for NS (OSX, GNUStep) can be built with ImageMagick support.

lisp/url/ChangeLog

+2013-08-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* url-http.el (url-handle-content-transfer-encoding): Renamed
+	`zlib-decompress-gzipped-region' and check whether it's available,
+	too.
+
 2013-08-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* url-vars.el (url-mime-encoding-string): If we have built-in gzip

lisp/url/url-http.el

@@ -860,13 +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 'decompress-gzipped-region)
+	       (fboundp 'zlib-decompress-gzipped-region)
+	       (zlib-available-p)
 	       (equal (downcase encoding) "gzip"))
       (save-restriction
 	(widen)
 	(goto-char (point-min))
 	(when (search-forward "\n\n")
-	  (decompress-gzipped-region (point) (point-max)))))))
+	  (zlib-decompress-gzipped-region (point) (point-max)))))))
 
 ;; Miscellaneous
 (defun url-http-activate-callback ()

lisp/url/url-vars.el

@@ -210,7 +210,7 @@ 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 'decompress-gzipped-region)
+(defvar url-mime-encoding-string (and (fboundp 'zlib-decompress-gzipped-region)
 				      "gzip")
   "String to send in the Accept-encoding: field in HTTP requests.")
 

src/ChangeLog

+2013-08-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* decompress.c (Fzlib_decompress_gzipped_region): Rename to
+	include the zlib prefix.
+
 2013-08-12  Eli Zaretskii  <eliz@gnu.org>
 
 	* decompress.c [WINDOWSNT]: Include windows.h and w32.h.

src/decompress.c

@@ -119,8 +119,8 @@ DEFUN ("zlib-available-p", Fzlib_available_p, Szlib_available_p, 0, 0, 0,
 #endif
 }
 
-DEFUN ("decompress-gzipped-region", Fdecompress_gzipped_region,
-       Sdecompress_gzipped_region,
+DEFUN ("zlib-decompress-gzipped-region", Fzlib_decompress_gzipped_region,
+       Szlib_decompress_gzipped_region,
        2, 2, 0,
        doc: /* Decompress a gzip-compressed region.
 Replace the text in the region by the decompressed data.
@@ -210,7 +210,7 @@ void
 syms_of_decompress (void)
 {
   DEFSYM (Qzlib_dll, "zlib");
-  defsubr (&Sdecompress_gzipped_region);
+  defsubr (&Szlib_decompress_gzipped_region);
   defsubr (&Szlib_available_p);
 }