mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-07 20:54:32 +00:00
Code Issues Releases Activity

(url-default-expander): Use concat to combine parts. (Bug #1020)

Browse Source
This commit is contained in:
Jason Rumney 2009-02-21 07:53:54 +00:00
parent ba32b5d2fc
commit 5ca454075e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/url/url-expand.el
View File

@ -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))))))