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

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 34db3be57d71d1659deab571afcda1a51e625883..146d224435b93484372c834d2cada94f8ff92f32 100644 (file)
--- 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 7b3b105d951c3d113202a825418dcfd4944b6634..b7efd75b4b65451909e1373acb714502536ec124 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)