diff options
| author | Richard M. Stallman <rms@gnu.org> | 2007-10-13 14:04:06 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2007-10-13 14:04:06 +0000 |
| commit | 4148f522b8f2f1aca27b92da6391a0d925207228 (patch) | |
| tree | 4e4080040eb25ca29c8a72240beb1453faba5ca3 /lisp/url | |
| parent | ff51e86df1da6ea87c81eb61f26ba58d4a11dd4d (diff) | |
| download | emacs-4148f522b8f2f1aca27b92da6391a0d925207228.tar.gz | |
(url-default-expander): Use `url-file-directory'.
Diffstat (limited to 'lisp/url')
| -rw-r--r-- | lisp/url/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/url/url-expand.el | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 34db3be57d7..146d224435b 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,14 @@ +2007-10-13 Richard Stallman <rms@gnu.org> + + * url-util.el (url-basepath): Function deleted. + (url-file-directory, url-file-nondirectory): New functions + replacing url-basepath. Callers changed. + + * url-expand.el (url-default-expander): Use `url-file-directory'. + + * url-auth.el (url-digest-auth, url-basic-auth): + Rename `path' to `file'. Use `url-file-directory'. + 2007-10-12 Diane Murray <disumu@x3y2z1.net> * url-auth.el (url-basic-auth): Set path to "/" when URL has an diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el index 7b3b105d951..b7efd75b4b6 100644 --- a/lisp/url/url-expand.el +++ b/lisp/url/url-expand.el @@ -135,7 +135,8 @@ path components followed by `..' are removed, along with the `..' itself." sepchar (substring (url-filename urlobj) (match-beginning 0) (match-end 0))) (setq file (url-filename urlobj))) (setq file (url-expander-remove-relative-links - (concat (url-basepath (url-filename defobj)) file))) + (expand-file-name file + (url-file-directory (url-filename defobj))))) (url-set-filename urlobj (if query (concat file sepchar query) file)))))) (provide 'url-expand) |