From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Tue, 16 Nov 2010 13:46:12 +0000 (+0100)
Subject: Avoid interpreting file:/foo:/bar URLs via tramp.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~225
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=023ec128fd95eadac7b607177969267cc8b9accf;p=emacs.git

Avoid interpreting file:/foo:/bar URLs via tramp.
---

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 4ef2b42756b..69a6746cee1 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* url-file.el (url-file-build-filename): Avoid interpreting
+	file:/foo:/bar URLs via tramp.
+
 2010-10-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* url-gw.el (url-open-stream): Use open-gnutls-stream if it exists.
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index 4e86c653c8c..22d74b3371b 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -103,12 +103,19 @@ to them."
 		     (format "%s#%d" host port))
 		 host))
 	 (file (url-unhex-string (url-filename url)))
-	 (filename (if (or user (not (url-file-host-is-local-p host)))
-		       (concat "/" (or user "anonymous") "@" site ":" file)
-		     (if (and (memq system-type '(ms-dos windows-nt))
-			      (string-match "^/[a-zA-Z]:/" file))
-			 (substring file 1)
-		       file)))
+	 (filename (cond
+		    ;; ftp: URL.
+		    ((or user (not (url-file-host-is-local-p host)))
+		     (concat "/" (or user "anonymous") "@" site ":" file))
+		    ;; file: URL on Windows.
+		    ((and (string-match "\\`/[a-zA-Z]:/" file)
+			  (memq system-type '(ms-dos windows-nt)))
+		     (substring file 1))
+		    ;; file: URL with a file:/bar:/foo-like spec.
+		    ((string-match "\\`/[^/]+:/" file)
+		     (concat "/:" file))
+		    (t
+		     file)))
 	 pos-index)
 
     (and user pass