[Emacs-diffs] Changes to emacs/lisp/net/tramp-smb.el,v

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       07/10/27 13:57:43

Index: net/tramp-smb.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp-smb.el,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- net/tramp-smb.el    4 Oct 2007 20:09:32 -0000       1.34
+++ net/tramp-smb.el    27 Oct 2007 13:57:43 -0000      1.35
@@ -205,9 +205,10 @@
 ;; File name primitives
 
 (defun tramp-smb-handle-copy-file
-  (filename newname &optional ok-if-already-exists keep-date)
+  (filename newname &optional ok-if-already-exists keep-date preserve-uid-gid)
   "Like `copy-file' for Tramp files.
-KEEP-DATE is not handled in case NEWNAME resides on an SMB server."
+KEEP-DATE is not handled in case NEWNAME resides on an SMB server.
+PRESERVE-UID-GID is completely ignored."
   (setq filename (expand-file-name filename)
        newname (expand-file-name newname))
 
@@ -574,7 +575,7 @@
   (with-parsed-tramp-file-name filename nil
     (unless (eq append nil)
       (tramp-error
-        v 'file-error "Cannot append to file using tramp (`%s')" filename))
+        v 'file-error "Cannot append to file using Tramp (`%s')" filename))
     ;; XEmacs takes a coding system as the seventh argument, not `confirm'.
     (when (and (not (featurep 'xemacs))
               confirm (file-exists-p filename))