summaryrefslogtreecommitdiff
path: root/lisp/url/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-06-25 23:55:15 -0700
committerGlenn Morris <rgm@gnu.org>2014-06-25 23:55:15 -0700
commit9ac6d28ab8c29547d9f9365dc8f7cea13c32ef7a (patch)
tree026dc1d5a858b27086c4f9d8e0f4a60b7907eb80 /lisp/url/ChangeLog
parenta0e2175a9055f2ea8ae03744d495e5179885029d (diff)
parent436550da1bf8d2cdd92a60f6ce84f131a8045062 (diff)
downloademacs-9ac6d28ab8c29547d9f9365dc8f7cea13c32ef7a.tar.gz
Merge from emacs-24; up to 2014-06-11T19:33:14Z!rgm@gnu.org
Diffstat (limited to 'lisp/url/ChangeLog')
-rw-r--r--lisp/url/ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index b445ff6d1f1..b8e34ea65c4 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,11 @@
+2014-06-26 Leo Liu <sdl.web@gmail.com>
+
+ * url-http.el (url-http-end-of-headers): Remove duplicate defvar.
+
+ * url-handlers.el (url-http-parse-response): Remove unused autoload.
+ (url-insert-file-contents): Condition on url-http-response-status
+ for the HTTP/S specific part. (Bug#17549)
+
2014-05-14 Glenn Morris <rgm@gnu.org>
* url-util.el (url-make-private-file): Use with-file-modes.