* 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d3ff6c..764efc4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-25  Michael Albinus  <michael.albinus@gmx.de>
+
+       * 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  <cyd@gnu.org>
 
        Add custom groups for VC backends, for consistency with vc-bzr.
 2012-02-25  Chong Yidong  <cyd@gnu.org>
 
        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 38e1973..801ec5f 100644 (file)
--- 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
      '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)))
   "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 afce61c..d3f0d8a 100644 (file)
--- 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
         (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))
   "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 851b116..cc1977d 100644 (file)
--- 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
                  '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))
                  ;; XEmacs only.
                  'dired-make-relative-symlink
                  'vm-imap-move-mail 'vm-pop-move-mail 'vm-spool-move-mail))