# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1235202834 0
# Node ID fa76b8415858d041905723e2547e834ba168d020
# Parent  c0cacccaa35189077a90dba64d3d6ea3cc8082b9
(url-default-expander): Use concat to combine parts.  (Bug #1020)

diff -r c0cacccaa351 -r fa76b8415858 lisp/url/url-expand.el
--- 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))))))