Merge from mainline.

[gnu-emacs] / lisp / url / url-expand.el

diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el
index d95be0581e7af0f0b603e11262c50b82314858ef..f59dadcadc63a84d28a8d61e8337ed4a248efe5e 100644 (file)
--- a/lisp/url/url-expand.el
+++ b/lisp/url/url-expand.el
@@ -1,6 +1,7 @@
 ;;; url-expand.el --- expand-file-name for URLs
 
-;; Copyright (C) 1999, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
@@ -133,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))))))