* net/tramp.el (tramp-handle-file-remote-p): Return a string as

remote identification.

lisp/ChangeLog

@@ -3,6 +3,9 @@
 	* files.el (set-auto-mode): Handle also remote files wrt
 	`auto-mode-alist'.
 
+	* net/tramp.el (tramp-handle-file-remote-p): Return a string as
+	remote identification.
+
 2007-08-04  Glenn Morris  <rgm@gnu.org>
 
 	* autorevert.el (auto-revert-tail-mode): auto-revert-tail-pos is

lisp/files.el

@@ -2260,7 +2260,7 @@ we don't actually set it to the same mode the buffer already has."
     (unless done
       (if buffer-file-name
 	  (let ((name buffer-file-name)
-		(remote-id (file-remote-p buffer-file-name)))
+		(remote-id (regexp-quote (file-remote-p buffer-file-name))))
 	    ;; Remove remote file name identification.
 	    (when (and (stringp remote-id)
 		       (string-match remote-id name))

lisp/net/tramp.el

@@ -3872,7 +3872,7 @@ This will break if COMMAND prints a newline, followed by the value of
   "Like `file-remote-p' for tramp files."
   (when (tramp-tramp-file-p filename)
     (with-parsed-tramp-file-name filename nil
-      (vector multi-method method user host ""))))
+      (tramp-make-tramp-file-name multi-method method user host ""))))
 
 (defun tramp-handle-insert-file-contents
   (filename &optional visit beg end replace)