diff options
| author | Glenn Morris | 2014-05-11 23:59:30 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-05-11 23:59:30 -0700 |
| commit | bbbabffe06d4c763534d5be92844c48a3f8746e2 (patch) | |
| tree | a6fffb13638948223f3142e5209cbce57282fbbd /lisp/url/ChangeLog | |
| parent | ffd6d9c4d321e93e301f9cafd1fe054389898978 (diff) | |
| parent | 96b894717caa773aa6d98ff57385f1c7537e8972 (diff) | |
| download | emacs-bbbabffe06d4c763534d5be92844c48a3f8746e2.tar.gz emacs-bbbabffe06d4c763534d5be92844c48a3f8746e2.zip | |
Merge from emacs-24; up to 2014-05-12T06:15:47Z!rgm@gnu.org
Diffstat (limited to 'lisp/url/ChangeLog')
| -rw-r--r-- | lisp/url/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index f3426656038..aba4a2c53e8 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-05-12 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * url-handlers.el (url-file-handler-load-in-progress): New defvar. | ||
| 4 | (url-file-handler): Use it, in order to avoid recursive load. | ||
| 5 | |||
| 1 | 2014-05-04 Glenn Morris <rgm@gnu.org> | 6 | 2014-05-04 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * url-parse.el (url-generic-parse-url): Doc fix (replace `iff'). | 8 | * url-parse.el (url-generic-parse-url): Doc fix (replace `iff'). |