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

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

Browse source
This commit is contained in:
Lars Magne Ingebrigtsen 2013-08-12 15:54:45 +02:00
parent 594a430782
commit 8a44a18468
6 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/NEWS
View file

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

6
lisp/url/ChangeLog
View file

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

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

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

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

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

5
src/ChangeLog
View file

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

6
src/decompress.c
View file

@ -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);
}