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

6 files changed, 19 insertions, 7 deletions

diff --git a/etc/NEWS b/etc/NEWS
index f5f6e48639e..e37b107176c 100644
--- a/etc/NEWS
+++ b/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.
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 9bdaff6f51a..7ac445e03c1 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+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
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index beffbe1f79b..9eab1a6f683 100644
--- a/lisp/url/url-http.el
+++ b/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 ()
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index a59667b57b0..786b5533bf8 100644
--- a/lisp/url/url-vars.el
+++ b/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.")
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 44af7c6b385..3a8fcfe7e9c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/src/decompress.c b/src/decompress.c
index af8435b2fd0..3605d446e5a 100644
--- a/src/decompress.c
+++ b/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);
 }