summaryrefslogtreecommitdiff
path: root/lisp/url/ChangeLog
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2014-10-20 21:17:06 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2014-10-20 21:17:06 -0400
commiteed18bf1fd1162872e196091ab795a773f277e8e (patch)
treef3fee81f1e7fdf23b57138740437e07ce244ede8 /lisp/url/ChangeLog
parent8a85c254de2528be0f3ff154fa24df65e6557c1a (diff)
parent1fc82d89a8a603754d17a35be1ce78e66d0b6fd6 (diff)
downloademacs-eed18bf1fd1162872e196091ab795a773f277e8e.tar.gz
Merge from emacs-24
Diffstat (limited to 'lisp/url/ChangeLog')
-rw-r--r--lisp/url/ChangeLog10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index f725ba66359..26e1dd1756d 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -128,19 +128,19 @@
2013-08-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
- * url-http.el (url-handle-content-transfer-encoding): Renamed
+ * url-http.el (url-handle-content-transfer-encoding): Rename
`zlib-decompress-gzipped-region' and check whether it's available,
too.
- (url-handle-content-transfer-encoding): Renamed
- `zlib-decompress-region' again.
+ (url-handle-content-transfer-encoding):
+ Rename `zlib-decompress-region' again.
2013-08-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
* url-vars.el (url-mime-encoding-string): If we have built-in gzip
support, say that we accept gzipped content.
- * url-http.el (url-handle-content-transfer-encoding): Support
- decompressing gzipped content.
+ * url-http.el (url-handle-content-transfer-encoding):
+ Support decompressing gzipped content.
2013-07-31 Stefan Monnier <monnier@iro.umontreal.ca>