From a3fcfa99f65c578d857ce0f6e8595f6a5ad77ec8 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 25 Feb 2012 09:51:32 +0100 Subject: [PATCH] * 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. --- lisp/ChangeLog | 9 +++++++++ lisp/net/tramp-sh.el | 2 +- lisp/net/tramp-smb.el | 2 +- lisp/net/tramp.el | 2 ++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8d3ff6c4225..764efc4d640 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2012-02-25 Michael Albinus + + * 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. + 2012-02-25 Chong Yidong Add custom groups for VC backends, for consistency with vc-bzr. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 38e19730a6d..801ec5f5fc9 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1909,7 +1909,7 @@ tramp-sh-handle-file-name-all-completions: internal error accessing `%s': `%s'" 'copy-file (list filename newname ok-if-already-exists keep-date))))) (defun tramp-sh-handle-copy-directory - (dirname newname &optional keep-date parents) + (dirname newname &optional keep-date parents copy-contents) "Like `copy-directory' for Tramp files." (let ((t1 (tramp-tramp-file-p dirname)) (t2 (tramp-tramp-file-p newname))) diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index afce61cba83..d3f0d8afb12 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -288,7 +288,7 @@ pass to the OPERATION." (buffer-name)))))) (defun tramp-smb-handle-copy-directory - (dirname newname &optional keep-date parents) + (dirname newname &optional keep-date parents copy-contents) "Like `copy-directory' for Tramp files. KEEP-DATE is not handled." (setq dirname (expand-file-name dirname) newname (expand-file-name newname)) 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)) -- 2.39.2