# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1257637968 0
# Node ID 535ef0fe168969bcda7fd625e74edc81fd43bba5
# Parent  ac069dcbfe759f276d13d8fe6f7b389085096812
* net/tramp.el (tramp-handle-copy-directory): Don't use
`file-remote-p' (due to compatibility).

diff -r ac069dcbfe75 -r 535ef0fe1689 lisp/net/tramp.el
--- a/lisp/net/tramp.el	Sat Nov 07 23:51:17 2009 +0000
+++ b/lisp/net/tramp.el	Sat Nov 07 23:52:48 2009 +0000
@@ -3404,8 +3404,9 @@
 	       ;; When DIRNAME and NEWNAME are remote, they must have
 	       ;; the same method.
 	       (or (null t1) (null t2)
-		   (string-equal (file-remote-p dirname 'method)
-				 (file-remote-p newname 'method))))
+		   (string-equal
+		    (tramp-file-name-method (tramp-dissect-file-name dirname))
+		    (tramp-file-name-method (tramp-dissect-file-name newname)))))
 	  ;; scp or rsync DTRT.
 	  (progn
 	    (setq dirname (directory-file-name (expand-file-name dirname))