diff options
| author | Jason Rumney <jasonr@gnu.org> | 2009-02-21 07:53:54 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2009-02-21 07:53:54 +0000 |
| commit | 5ca454075e54e84a574831b9ca4e0d087ab6987d (patch) | |
| tree | 5efe7f09bf9ecf4660b57adcf8a7ea372a689dd5 /lisp/url/url-expand.el | |
| parent | ba32b5d2fc18e11fb8e65fbe1c04d721471074ad (diff) | |
| download | emacs-5ca454075e54e84a574831b9ca4e0d087ab6987d.tar.gz emacs-5ca454075e54e84a574831b9ca4e0d087ab6987d.tar.bz2 emacs-5ca454075e54e84a574831b9ca4e0d087ab6987d.zip | |
(url-default-expander): Use concat to combine parts. (Bug #1020)
Diffstat (limited to 'lisp/url/url-expand.el')
| -rw-r--r-- | lisp/url/url-expand.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el index 14dafbdc2da..d37b0b2223a 100644 --- a/lisp/url/url-expand.el +++ b/lisp/url/url-expand.el @@ -134,9 +134,11 @@ path components followed by `..' are removed, along with the `..' itself." 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)))))) |