Mercurial > emacs
changeset 102156:fa76b8415858
(url-default-expander): Use concat to combine parts. (Bug #1020)
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Sat, 21 Feb 2009 07:53:54 +0000 |
| parents | c0cacccaa351 |
| children | 7b5135847f38 |
| files | lisp/url/url-expand.el |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/url/url-expand.el Sat Feb 21 03:18:42 2009 +0000 +++ b/lisp/url/url-expand.el Sat Feb 21 07:53:54 2009 +0000 @@ -134,9 +134,11 @@ file (substring (url-filename urlobj) 0 (match-beginning 0)) sepchar (substring (url-filename urlobj) (match-beginning 0) (match-end 0))) (setq file (url-filename urlobj))) + ;; We use concat rather than expand-file-name to combine + ;; directory and file name, since urls do not follow the same + ;; rules as local files on all platforms. (setq file (url-expander-remove-relative-links - (expand-file-name file - (url-file-directory (url-filename defobj))))) + (concat (url-file-directory (url-filename defobj)) file))) (setf (url-filename urlobj) (if query (concat file sepchar query) file))))))