summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2009-11-07 23:52:48 +0000
committerMichael Albinus <michael.albinus@gmx.de>2009-11-07 23:52:48 +0000
commitb000a6e24e98f0713c150c1e5c845608797455a3 (patch)
tree6d09673c675f3283a57d70cabd9bbe83d5383846 /lisp/net
parentc2770957182dce2b6f365829f5f4563aa1dbc3a3 (diff)
downloademacs-b000a6e24e98f0713c150c1e5c845608797455a3.tar.gz
* net/tramp.el (tramp-handle-copy-directory): Don't use
`file-remote-p' (due to compatibility).
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/tramp.el5
1 files changed, 3 insertions, 2 deletions
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))