[Emacs-diffs] /srv/bzr/emacs/trunk r107421: * net/tramp.el (tramp-file-name-for-operation): Add

[Michael Albinus]

------------------------------------------------------------
revno: 107421
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sat 2012-02-25 09:51:32 +0100
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/net/tramp-sh.el
  lisp/net/tramp-smb.el
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-25 04:29:09 +0000
+++ b/lisp/ChangeLog    2012-02-25 08:51:32 +0000
@@ -1,3 +1,12 @@
+2012-02-25  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        Add custom groups for VC backends, for consistency with vc-bzr.

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2012-01-22 12:55:36 +0000
+++ b/lisp/net/tramp-sh.el      2012-02-25 08:51:32 +0000
@@ -1909,7 +1909,7 @@
      '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)))

=== modified file 'lisp/net/tramp-smb.el'
--- a/lisp/net/tramp-smb.el     2012-01-19 07:21:25 +0000
+++ b/lisp/net/tramp-smb.el     2012-02-25 08:51:32 +0000
@@ -288,7 +288,7 @@
         (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))

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2012-02-11 22:13:29 +0000
+++ b/lisp/net/tramp.el 2012-02-25 08:51:32 +0000
@@ -1809,6 +1809,8 @@
                  '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))