From: Richard M. Stallman Date: Sat, 13 Oct 2007 14:04:06 +0000 (+0000) Subject: (url-default-expander): Use `url-file-directory'. X-Git-Tag: emacs-pretest-22.1.90~619 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4148f522b8f2f1aca27b92da6391a0d925207228;p=emacs.git (url-default-expander): Use `url-file-directory'. --- 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 + + * 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 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)