Merge from emacs-24; up to 2014-06-11T19:33:14Z!rgm@gnu.org

[bpt/emacs.git] / lisp / url / ChangeLog

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 486c664..b8e34ea 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,24 @@
+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.
+
+2014-05-12  Michael Albinus  <michael.albinus@gmx.de>
+
+       * url-handlers.el (url-file-handler-load-in-progress): New defvar.
+       (url-file-handler): Use it, in order to avoid recursive load.
+
+2014-05-04  Glenn Morris  <rgm@gnu.org>
+
+       * url-parse.el (url-generic-parse-url): Doc fix (replace `iff').
+
 2014-04-01  Michael Albinus  <michael.albinus@gmx.de>
 
        * url-tramp.el: New file.