[Emacs-diffs] emacs/lisp/url url-expand.el

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   09/02/21 07:53:54

Modified files:
        lisp/url       : url-expand.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/url-expand.el?cvsroot=emacs&r1=1.15&r2=1.16

Patches:
Index: url-expand.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-expand.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- url-expand.el       5 Jan 2009 03:24:16 -0000       1.15
+++ url-expand.el       21 Feb 2009 07:53:54 -0000      1.16
@@ -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))))))