Merge from emacs-24; up to 2014-05-12T06:15:47Z!rgm@gnu.org

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

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index bb7025b..aba4a2c 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,20 @@
+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.
+
+       * url-handlers.el (url-handler-regexp): Add ssh, scp, rsync and telnet.
+       Add :version.
+       (url-file-handler): Call `url-tramp-file-handler' if appropriate.
+
 2014-03-28  Glenn Morris  <rgm@gnu.org>
 
        * url-vars.el (url-bug-address): Make into an obsolete alias.