procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Also support zlib-format compression.
This commit is contained in:
Lars Magne Ingebrigtsen 2013-08-12 19:02:31 +02:00
parent 1d238bc75a
commit 7699d09ec6
6 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
etc/NEWS
View file

@ -43,7 +43,8 @@ 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
`zlib-decompress-gzipped-region' becomes available.
`zlib-decompress-region' becomes available, which can decompress gzip-
and zlib-format compressed data.
---
** Emacs for NS (OSX, GNUStep) can be built with ImageMagick support.

2
lisp/url/ChangeLog
View file

@ -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>

4
lisp/url/url-http.el
View file

@ -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 ()

3
lisp/url/url-vars.el
View file

@ -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.")

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2013-08-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
* decompress.c (Fzlib_decompress_region): Support zlib
decompression, too, and rename.
2013-08-12 Paul Eggert <eggert@cs.ucla.edu>
Minor zlib configuration tweaks.

13
src/decompress.c
View file

@ -119,10 +119,10 @@ DEFUN ("zlib-available-p", Fzlib_available_p, Szlib_available_p, 0, 0, 0,
#endif
}
DEFUN ("zlib-decompress-gzipped-region", Fzlib_decompress_gzipped_region,
Szlib_decompress_gzipped_region,
DEFUN ("zlib-decompress-region", Fzlib_decompress_region,
Szlib_decompress_region,
2, 2, 0,
doc: /* Decompress a gzip-compressed region.
doc: /* Decompress a gzip- or zlib-compressed region.
Replace the text in the region by the decompressed data.
On failure, return nil and leave the data in place.
This function can be called only in unibyte buffers. */)
@ -151,8 +151,9 @@ This function can be called only in unibyte buffers. */)
stream.avail_in = 0;
stream.next_in = Z_NULL;
/* This magic number apparently means "this is gzip". */
if (fn_inflateInit2 (&stream, 16 + MAX_WBITS) != Z_OK)
/* The magic number 32 apparently means "autodect both the gzip and
zlib formats" according to zlib.h. */
if (fn_inflateInit2 (&stream, MAX_WBITS + 32) != Z_OK)
return Qnil;
unwind_data.start = iend;
@ -210,7 +211,7 @@ void
syms_of_decompress (void)
{
DEFSYM (Qzlib_dll, "zlib");
defsubr (&Szlib_decompress_gzipped_region);
defsubr (&Szlib_decompress_region);
defsubr (&Szlib_available_p);
}