* net/ange-ftp.el: Add ange-ftp property to 'set-file-modes and

'set-file-times.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22f7daf82284a031ff6e366f8a18538b89c9e203..d69b3000eaef40df8aa0dc1495f22e6de2a60ee3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-30  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/ange-ftp.el: Add ange-ftp property to 'set-file-modes and
+       'set-file-times.
+
 2007-08-30  Carsten Dominik  <dominik@science.uva.nl>
 
        * textmodes/org.el (org-export-visible): Fix drawers before export.
@@ -39,7 +44,7 @@
        (org-todo-keyword-faces): New option.
        (org-set-regexps-and-options): Use `org-remove-keyword-keys'.
        (org-remove-keyword-keys): New function.
-       
+
 2007-08-30  Jari Aalto  <jari.aalto@cante.net>  (tiny change)
 
        * progmodes/grep.el (grep-find-ignored-directories): Add
@@ -2902,7 +2907,7 @@
        * net/tramp-util.el:
        * net/tramp-vc.el: Removed.
 
-       * net/ange-ftp.el: Add ange-ftp property to 'start-file-process
+       * net/ange-ftp.el: Add ange-ftp property to 'start-file-process.
        (ange-ftp-file-remote-p): Handle optional parameter CONNECTED.
 
        * net/rcompile.el (remote-compile): Handle Tramp 2.1 arguments.

diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 2f06344ccdab2d504aa182080a1d70254bd59520..2ebf0374658ebee7ed0b3f05ccd3db2ceea3ddb0 100644 (file)
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -4372,12 +4372,18 @@ NEWNAME should be the name to give the new compressed or uncompressed file.")
 ;; Treat each name as its own truename.
 (put 'file-truename 'ange-ftp 'identity)
 
+;; We must return non-nil in order to mask our inability to do the job.
+;; Otherwise there are errors when applied to the target file during
+;; copying from a (localhost) Tramp file.
+(put 'set-file-modes 'ange-ftp 'ignore)
+(put 'set-file-times 'ange-ftp 'ignore)
+
 ;; Turn off RCS/SCCS processing to save time.
 ;; This returns nil for any file name as argument.
 (put 'vc-registered 'ange-ftp 'null)
 
 ;; We can handle process-file in a restricted way (just for chown).
-;; Nothing possible for start-file-process.
+;; Nothing possible for `start-file-process'.
 (put 'process-file 'ange-ftp 'ange-ftp-process-file)
 (put 'start-file-process 'ange-ftp 'ignore)
 (put 'shell-command 'ange-ftp 'ange-ftp-shell-command)