From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 7 Nov 2009 23:52:48 +0000 (+0000)
Subject: * net/tramp.el (tramp-handle-copy-directory): Don't use
X-Git-Tag: emacs-pretest-23.1.90~537
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b000a6e24e98f0713c150c1e5c845608797455a3;p=emacs.git

* net/tramp.el (tramp-handle-copy-directory): Don't use
`file-remote-p' (due to compatibility).
---

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index f89c32102e2..7a6da178a61 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3404,8 +3404,9 @@ tramp-handle-file-name-all-completions: internal error accessing `%s': `%s'"
 	       ;; 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))