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

[bpt/emacs.git] / lisp / url / url-expand.el

diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el
index 7b3b105..b7efd75 100644 (file)
--- 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)