summaryrefslogtreecommitdiff
path: root/lisp/net/tramp.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2012-02-25 09:51:32 +0100
committerMichael Albinus <michael.albinus@gmx.de>2012-02-25 09:51:32 +0100
commita3fcfa99f65c578d857ce0f6e8595f6a5ad77ec8 (patch)
treeb2b6ad8910ae1a40fb51e3c1756b62e60f4349da /lisp/net/tramp.el
parent67b0de11479247cb8bd8491e10e0b464046f18be (diff)
downloademacs-a3fcfa99f65c578d857ce0f6e8595f6a5ad77ec8.tar.gz
* net/tramp.el (tramp-file-name-for-operation): Add
`files-equal-p' and `file-subdir-of-p'. * net/tramp-sh.el (tramp-sh-handle-copy-directory): * net/tramp-smb.el (tramp-smb-handle-copy-directory): Add COPY-CONTENTS argument.
Diffstat (limited to 'lisp/net/tramp.el')
-rw-r--r--lisp/net/tramp.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 851b11629f4..cc1977dfe22 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1809,6 +1809,8 @@ ARGS are the arguments OPERATION has been called with."
'file-newer-than-file-p 'make-symbolic-link 'rename-file
;; Emacs 23+ only.
'copy-directory
+ ;; Emacs 24+ only.
+ 'files-equal-p 'file-subdir-of-p
;; XEmacs only.
'dired-make-relative-symlink
'vm-imap-move-mail 'vm-pop-move-mail 'vm-spool-move-mail))