Commit 4148f522 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(url-default-expander): Use `url-file-directory'.

parent ff51e86d
2007-10-13 Richard Stallman <>
* 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 <>
* url-auth.el (url-basic-auth): Set path to "/" when URL has an
......@@ -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)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment