diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-15 02:07:53 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-15 02:07:53 +0000 |
| commit | b2529d56b5126319a1659dc1530d6fc102cc21d6 (patch) | |
| tree | d538297f4ddc6c9200bfed9a1a67ddb479dcc7da /lisp/url/url-expand.el | |
| parent | decb374a426c8d095d144829791305d91a26b7b7 (diff) | |
| parent | 69779ec883ae09f0187aa961930e7b308a71eebb (diff) | |
| download | emacs-b2529d56b5126319a1659dc1530d6fc102cc21d6.tar.gz | |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 116-121)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-889
Diffstat (limited to 'lisp/url/url-expand.el')
| -rw-r--r-- | lisp/url/url-expand.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el index df4de29a619..bebdbd9e04b 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))))) (setf (url-filename urlobj) (if query (concat file sepchar query) file)))))) |