[Emacs-diffs] trunk r113817: Add the zlib prefix to `decompress-gzipped-region'

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 113817
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2013-08-12 15:54:45 +0200
message:
  Add the zlib prefix to `decompress-gzipped-region'
modified:
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/url/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-3116
  lisp/url/url-http.el           urlhttp.el-20091113204419-o5vbwnq5f7feedwu-2989
  lisp/url/url-vars.el           urlvars.el-20091113204419-o5vbwnq5f7feedwu-3004
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/decompress.c               decompress.c-20130811194033-wfhl0tqmmc36jfmu-1

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-08-11 19:43:36 +0000
+++ b/etc/NEWS  2013-08-12 13:54:45 +0000
@@ -43,7 +43,7 @@
 
 ** 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.

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2013-08-11 20:52:50 +0000
+++ b/lisp/url/ChangeLog        2013-08-12 13:54:45 +0000
@@ -1,3 +1,9 @@
+2013-08-12  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * url-vars.el (url-mime-encoding-string): If we have built-in gzip

=== modified file 'lisp/url/url-http.el'
--- a/lisp/url/url-http.el      2013-08-11 20:52:50 +0000
+++ b/lisp/url/url-http.el      2013-08-12 13:54:45 +0000
@@ -860,13 +860,14 @@
 (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 ()

=== modified file 'lisp/url/url-vars.el'
--- a/lisp/url/url-vars.el      2013-08-11 20:52:50 +0000
+++ b/lisp/url/url-vars.el      2013-08-12 13:54:45 +0000
@@ -210,7 +210,7 @@
 
 (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.")
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-12 13:15:01 +0000
+++ b/src/ChangeLog     2013-08-12 13:54:45 +0000
@@ -1,3 +1,8 @@
+2013-08-12  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * decompress.c (Fzlib_decompress_gzipped_region): Rename to
+       include the zlib prefix.
+
 2013-08-12  Eli Zaretskii  <address@hidden>
 
        * decompress.c [WINDOWSNT]: Include windows.h and w32.h.

=== modified file 'src/decompress.c'
--- a/src/decompress.c  2013-08-12 13:15:01 +0000
+++ b/src/decompress.c  2013-08-12 13:54:45 +0000
@@ -119,8 +119,8 @@
 #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 @@
 syms_of_decompress (void)
 {
   DEFSYM (Qzlib_dll, "zlib");
-  defsubr (&Sdecompress_gzipped_region);
+  defsubr (&Szlib_decompress_gzipped_region);
   defsubr (&Szlib_available_p);
 }