* net/tramp.el (tramp-handle-set-file-times): Flush the file

properties.
(tramp-set-file-uid-gid, tramp-get-local-uid)
(tramp-get-local-gid): New defuns.
(tramp-handle-copy-file): Handle new parameter PRESERVE-UID-GID.
(tramp-do-copy-or-rename-file): New parameter PRESERVE-UID-GID.
Improve fast track.
(tramp-do-copy-or-rename-file-directly): Sync parameter list with
the other tramp-do-copy-or-rename-file-* functions.  Major
rewrite.
(tramp-handle-file-local-copy, tramp-handle-insert-file-contents)
(tramp-handle-write-region): Improve fast track.
(tramp-handle-file-remote-p): IDENTIFICATION can also be
'localname.
(tramp-maybe-open-connection): Let `process-adaptive-read-buffering'
be nil.

2 files changed, 393 insertions, 234 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d07d9f1b125..ef5ac4d84f9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2007-08-28  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-handle-set-file-times): Flush the file
+        properties.
+        (tramp-set-file-uid-gid, tramp-get-local-uid)
+        (tramp-get-local-gid): New defuns.
+        (tramp-handle-copy-file): Handle new parameter PRESERVE-UID-GID.
+        (tramp-do-copy-or-rename-file): New parameter PRESERVE-UID-GID.
+        Improve fast track.
+        (tramp-do-copy-or-rename-file-directly): Sync parameter list with
+        the other tramp-do-copy-or-rename-file-* functions.  Major
+        rewrite.
+        (tramp-handle-file-local-copy, tramp-handle-insert-file-contents)
+        (tramp-handle-write-region): Improve fast track.
+        (tramp-handle-file-remote-p): IDENTIFICATION can also be
+        'localname.
+        (tramp-maybe-open-connection): Let `process-adaptive-read-buffering'
+        be nil.
+
 2007-08-28  Ivan Kanis  <apple@kanis.eu>
 
         * time.el: New feature to display several time zones in a buffer.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 85f9287fca8..affeac31c33 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2506,6 +2506,7 @@ of."
   (zerop
    (if (file-remote-p filename)
        (with-parsed-tramp-file-name filename nil
+         (tramp-flush-file-property v localname)
          (let ((time (if (or (null time) (equal time '(0 0)))
                          (current-time)
                        time))
@@ -2527,6 +2528,7 @@ of."
                           (format-time-string "%Y%m%d%H%M.%S" time t)
                         (format-time-string "%Y%m%d%H%M.%S" time))
                       (tramp-shell-quote-argument localname)))))
+
      ;; We handle also the local part, because in older Emacsen,
      ;; without `set-file-times', this function is an alias for this.
      ;; We are local, so we don't need the UTC settings.
@@ -2535,6 +2537,34 @@ of."
       (format-time-string "%Y%m%d%H%M.%S" time)
       (tramp-shell-quote-argument filename)))))
 
+(defun tramp-set-file-uid-gid (filename &optional uid gid)
+  "Set the ownership for FILENAME.
+If UID and GID are provided, these values are used; otherwise uid
+and gid of the corresponding user is taken.  Both parameters must be integers."
+  ;; CCC: Modern Unices allow chown only for root.  So we might need
+  ;;      another implementation, see `dired-do-chown'.  OTOH, it is
+  ;;      mostly working with su(do)? when it is needed, so it shall
+  ;;      succeed in the majority of cases.
+  (if (file-remote-p filename)
+      (with-parsed-tramp-file-name filename nil
+        (let ((uid (or (and (integerp uid) uid)
+                       (tramp-get-remote-uid v 'integer)))
+              (gid (or (and (integerp gid) gid)
+                       (tramp-get-remote-gid v 'integer))))
+          (tramp-send-command
+           v (format
+              "chown %d:%d %s" uid gid
+              (tramp-shell-quote-argument localname)))))
+
+    ;; We handle also the local part, because there doesn't exist
+    ;; `set-file-uid-gid'.
+    (let ((uid (or (and (integerp uid) uid) (tramp-get-local-uid 'integer)))
+          (gid (or (and (integerp gid) gid) (tramp-get-local-uid 'integer)))
+          (default-directory (tramp-temporary-file-directory)))
+      (call-process
+       "chown" nil nil nil
+       (format "%d:%d" uid gid) (tramp-shell-quote-argument filename)))))
+
 ;; Simple functions using the `test' command.
 
 (defun tramp-handle-file-executable-p (filename)
@@ -2840,7 +2870,7 @@ of."
          (buffer-name))))))
 
 (defun tramp-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."
   ;; Check if both files are local -- invoke normal copy-file.
   ;; Otherwise, use tramp from local system.
@@ -2850,9 +2880,10 @@ of."
   (if (or (tramp-tramp-file-p filename)
           (tramp-tramp-file-p newname))
       (tramp-do-copy-or-rename-file
-       'copy filename newname ok-if-already-exists keep-date)
+       'copy filename newname ok-if-already-exists keep-date preserve-uid-gid)
     (tramp-run-real-handler
-     'copy-file (list filename newname ok-if-already-exists keep-date))))
+     'copy-file
+     (list filename newname ok-if-already-exists keep-date preserve-uid-gid))))
 
 (defun tramp-handle-rename-file
   (filename newname &optional ok-if-already-exists)
@@ -2865,19 +2896,20 @@ of."
   (if (or (tramp-tramp-file-p filename)
           (tramp-tramp-file-p newname))
       (tramp-do-copy-or-rename-file
-       'rename filename newname ok-if-already-exists t)
+       'rename filename newname ok-if-already-exists t t)
     (tramp-run-real-handler
      'rename-file (list filename newname ok-if-already-exists))))
 
 (defun tramp-do-copy-or-rename-file
-  (op filename newname &optional ok-if-already-exists keep-date)
+  (op filename newname &optional ok-if-already-exists keep-date preserve-uid-gid)
   "Copy or rename a remote file.
 OP must be `copy' or `rename' and indicates the operation to perform.
 FILENAME specifies the file to copy or rename, NEWNAME is the name of
 the new file (for copy) or the new name of the file (for rename).
 OK-IF-ALREADY-EXISTS means don't barf if NEWNAME exists already.
 KEEP-DATE means to make sure that NEWNAME has the same timestamp
-as FILENAME.
+as FILENAME.  PRESERVE-UID-GID, when non-nil, instructs to keep
+the uid and gid if both files are on the same host.
 
 This function is invoked by `tramp-handle-copy-file' and
 `tramp-handle-rename-file'.  It is an error if OP is neither of `copy'
@@ -2905,7 +2937,9 @@ and `rename'.  FILENAME and NEWNAME must be absolute file names."
                ;; directly.
                ((tramp-equal-remote filename newname)
                 (tramp-do-copy-or-rename-file-directly
-                 op v1 v1-localname v2-localname keep-date))
+                 op filename newname
+                 ok-if-already-exists keep-date preserve-uid-gid))
+
                ;; If both source and target are Tramp files,
                ;; both are using the same copy-program, then we
                ;; can invoke rcp directly.  Note that
@@ -2917,6 +2951,7 @@ and `rename'.  FILENAME and NEWNAME must be absolute file names."
                         tramp-copy-size-limit))
                 (tramp-do-copy-or-rename-file-out-of-band
                  op filename newname keep-date))
+
                ;; No shortcut was possible.  So we copy the
                ;; file first.  If the operation was `rename', we go
                ;; back and delete the original file (if the copy was
@@ -2933,20 +2968,29 @@ and `rename'.  FILENAME and NEWNAME must be absolute file names."
          ;; One file is a Tramp file, the other one is local.
          ((or t1 t2)
           (with-parsed-tramp-file-name (if t1 filename newname) nil
-            ;; If the Tramp file has an out-of-band method, the corresponding
-            ;; copy-program can be invoked.
-            (if (and (tramp-method-out-of-band-p v)
-                     (> (nth 7 (file-attributes filename))
-                        tramp-copy-size-limit))
-                (tramp-do-copy-or-rename-file-out-of-band
-                 op filename newname keep-date)
-              ;; Use the generic method via a Tramp buffer.
-              (tramp-do-copy-or-rename-file-via-buffer
-               op filename newname keep-date))))
+            (cond
+             ;; Fast track on local machine.
+             ((tramp-local-host-p v)
+              (tramp-do-copy-or-rename-file-directly
+               op filename newname
+               ok-if-already-exists keep-date preserve-uid-gid))
+
+             ;; If the Tramp file has an out-of-band method, the corresponding
+             ;; copy-program can be invoked.
+             ((and (tramp-method-out-of-band-p v)
+                   (> (nth 7 (file-attributes filename))
+                      tramp-copy-size-limit))
+              (tramp-do-copy-or-rename-file-out-of-band
+               op filename newname keep-date))
+
+             ;; Use the inline method via a Tramp buffer.
+             (t (tramp-do-copy-or-rename-file-via-buffer
+                 op filename newname keep-date)))))
 
          (t
           ;; One of them must be a Tramp file.
           (error "Tramp implementation says this cannot happen")))
+
       ;; When newname did exist, we have wrong cached values.
       (when t2
         (with-parsed-tramp-file-name newname nil
@@ -2977,53 +3021,132 @@ KEEP-DATE is non-nil if NEWNAME should have the same timestamp as FILENAME."
       (delete-file filename))))
 
 (defun tramp-do-copy-or-rename-file-directly
-  (op vec localname1 localname2 keep-date)
+ (op filename newname ok-if-already-exists keep-date preserve-uid-gid)
   "Invokes `cp' or `mv' on the remote system.
 OP must be one of `copy' or `rename', indicating `cp' or `mv',
-respectively.  VEC specifies the connection.  LOCALNAME1 and
-LOCALNAME2 specify the two arguments of `cp' or `mv'.  If
-KEEP-DATE is non-nil, preserve the time stamp when copying."
-  ;; CCC: What happens to the timestamp when renaming?
-  (let ((cmd (cond ((and (eq op 'copy) keep-date) "cp -f -p")
-                   ((eq op 'copy) "cp -f")
-                   ((eq op 'rename) "mv -f")
-                   (t (tramp-error
-                       vec 'file-error
-                       "Unknown operation `%s', must be `copy' or `rename'"
-                       op)))))
-    (tramp-send-command
-     vec
-     (format "%s %s %s"
-             cmd
-             (tramp-shell-quote-argument localname1)
-             (tramp-shell-quote-argument localname2)))
-    (with-current-buffer (tramp-get-buffer vec)
-      (goto-char (point-min))
-      (unless
-          (or
-           (and (eq op 'copy) keep-date
-                ;; Mask cp -f error.
-                (re-search-forward tramp-operation-not-permitted-regexp nil t))
-           (zerop (tramp-send-command-and-check vec nil)))
-        (tramp-error-with-buffer
-         nil vec 'file-error
-         "Copying directly failed, see buffer `%s' for details."
-         (buffer-name))))
-    ;; Set the mode.
-    ;; CCC: Maybe `chmod --reference=localname1 localname2' could be used
-    ;;      where available?
-    (unless (or (eq op 'rename) keep-date)
-      (set-file-modes
-       (tramp-make-tramp-file-name
-        (tramp-file-name-method vec)
-        (tramp-file-name-user vec)
-        (tramp-file-name-host vec)
-        localname2)
-       (file-modes (tramp-make-tramp-file-name
-                    (tramp-file-name-method vec)
-                    (tramp-file-name-user vec)
-                    (tramp-file-name-host vec)
-                    localname1))))))
+respectively.  FILENAME specifies the file to copy or rename,
+NEWNAME is the name of the new file (for copy) or the new name of
+the file (for rename).  Both files must reside on the same host.
+KEEP-DATE means to make sure that NEWNAME has the same timestamp
+as FILENAME.  PRESERVE-UID-GID, when non-nil, instructs to keep
+the uid and gid from FILENAME."
+  (with-parsed-tramp-file-name (if t1 filename newname) nil
+    (let* ((cmd (cond ((and (eq op 'copy) preserve-uid-gid) "cp -f -p")
+                      ((eq op 'copy) "cp -f")
+                      ((eq op 'rename) "mv -f")
+                      (t (tramp-error
+                          vec 'file-error
+                          "Unknown operation `%s', must be `copy' or `rename'"
+                          op))))
+           (t1 (tramp-tramp-file-p filename))
+           (t2 (tramp-tramp-file-p newname))
+           (localname1
+            (if t1 (tramp-handle-file-remote-p filename 'localname) filename))
+           (localname2
+            (if t2 (tramp-handle-file-remote-p newname 'localname) newname))
+           (prefix (tramp-handle-file-remote-p (if t1 filename newname)))
+           (tmpfile (tramp-make-temp-file localname1)))
+
+      (cond
+       ;; Both files are on a remote host, with same user.
+       ((and t1 t2)
+        (tramp-send-command
+         v
+         (format "%s %s %s" cmd
+                 (tramp-shell-quote-argument localname1)
+                 (tramp-shell-quote-argument localname2)))
+        (with-current-buffer (tramp-get-buffer v)
+          (goto-char (point-min))
+          (unless
+              (or
+               (and keep-date
+                    ;; Mask cp -f error.
+                    (re-search-forward
+                     tramp-operation-not-permitted-regexp nil t))
+               (zerop (tramp-send-command-and-check v nil)))
+            (tramp-error-with-buffer
+             nil v 'file-error
+             "Copying directly failed, see buffer `%s' for details."
+             (buffer-name)))))
+
+       ;; We are on the local host.
+       ((or t1 t2)
+        (cond
+         ;; We can do it directly.
+         ((and (file-readable-p localname1)
+               (file-writable-p (file-name-directory localname2)))
+          (if (eq op 'copy)
+              (copy-file
+               localname1 localname2 ok-if-already-exists
+               keep-date preserve-uid-gid)
+            (rename-file localname1 localname2 ok-if-already-exists)))
+
+         ;; We can do it directly with `tramp-send-command'
+         ((and (file-readable-p (concat prefix localname1))
+               (file-writable-p
+                (file-name-directory (concat prefix localname2))))
+          (tramp-do-copy-or-rename-file-directly
+           op (concat prefix localname1) (concat prefix localname2)
+           ok-if-already-exists keep-date t)
+          ;; We must change the ownership to the local user.
+          (tramp-set-file-uid-gid
+           (concat prefix localname2)
+           (tramp-get-local-uid 'integer)
+           (tramp-get-local-gid 'integer)))
+
+         ;; We need a temporary file in between.
+         (t
+          ;; Create the temporary file.
+          (cond
+           (t1
+            (tramp-send-command
+             v (format
+                "%s %s %s" cmd
+                (tramp-shell-quote-argument localname1)
+                (tramp-shell-quote-argument tmpfile)))
+            ;; We must change the ownership as remote user.
+            (tramp-set-file-uid-gid
+             (concat prefix tmpfile)
+             (tramp-get-local-uid 'integer)
+             (tramp-get-local-gid 'integer)))
+           (t2
+            (if (eq op 'copy)
+                (copy-file
+                 localname1 tmpfile ok-if-already-exists
+                 keep-date preserve-uid-gid)
+              (rename-file localname1 tmpfile ok-if-already-exists))
+            ;; We must change the ownership as local user.
+            (tramp-set-file-uid-gid
+             tmpfile
+             (tramp-get-remote-uid v 'integer)
+             (tramp-get-remote-gid v 'integer))))
+
+          ;; Move the temporary file to its destination.
+          (cond
+           (t2
+            (tramp-send-command
+             v (format
+                "%s %s %s" cmd
+                (tramp-shell-quote-argument tmpfile)
+                (tramp-shell-quote-argument localname2))))
+           (t1
+            (if (eq op 'copy)
+                (copy-file
+                 tmpfile localname2 ok-if-already-exists
+                 keep-date preserve-uid-gid)
+              (rename-file tmpfile localname2 ok-if-already-exists))))
+
+          ;; Remove temporary file.
+          (when (eq op 'copy) (delete-file tmpfile))))))
+
+      ;; Set the time and mode. Mask possible errors.
+      ;; Won't be applied for 'rename.
+      (condition-case nil
+          (when (and keep-date (not preserve-uid-gid))
+            (set-file-times newname (nth 5 (file-attributes filename)))
+            (set-file-modes newname (file-modes filename)))
+        (error)))))
+
 
 (defun tramp-do-copy-or-rename-file-out-of-band (op filename newname keep-date)
   "Invoke rcp program to copy.
@@ -3669,22 +3792,17 @@ beginning of local filename are not substituted."
   (with-parsed-tramp-file-name filename nil
     (let ((rem-enc (tramp-get-remote-coding v "remote-encoding"))
           (loc-dec (tramp-get-local-coding v "local-decoding"))
-          tmpfil)
+          (tmpfil (tramp-make-temp-file filename)))
       (unless (file-exists-p filename)
         (tramp-error
          v 'file-error
          "Cannot make local copy of non-existing file `%s'" filename))
-      (setq tmpfil (tramp-make-temp-file filename))
 
       (cond
-       ;; Fast track on local machine.
-       ((tramp-local-host-p v)
-        (tramp-do-copy-or-rename-file-directly 'copy v localname tmpfil t)
-        (tramp-send-command v (format "chown %s %s" (user-login-name) tmpfil)))
-
-       ;; `copy-file' handles out-of-band methods.
-       ((and (tramp-method-out-of-band-p v)
-             (> (nth 7 (file-attributes filename)) tramp-copy-size-limit))
+       ;; `copy-file' handles direct copy and out-of-band methods.
+       ((or (tramp-local-host-p v)
+            (and (tramp-method-out-of-band-p v)
+                 (> (nth 7 (file-attributes filename)) tramp-copy-size-limit)))
         (copy-file filename tmpfil t t))
 
        ;; Use inline encoding for file transfer.
@@ -3723,7 +3841,9 @@ beginning of local filename are not substituted."
               (delete-file tmpfil2)))
           (tramp-message v 5 "Decoding remote file %s...done" filename)
           ;; Set proper permissions.
-          (set-file-modes tmpfil (file-modes filename))))
+          (set-file-modes tmpfil (file-modes filename))
+          ;; Set local user ownership.
+          (tramp-set-file-uid-gid tmpfil)))
 
        ;; Oops, I don't know what to do.
        (t (tramp-error
@@ -3743,6 +3863,7 @@ beginning of local filename are not substituted."
             ((eq identification 'method) method)
             ((eq identification 'user) user)
             ((eq identification 'host) host)
+            ((eq identification 'localname) localname)
             (t (tramp-make-tramp-file-name method user host "")))))))
 
 (defun tramp-handle-insert-file-contents
@@ -3750,43 +3871,51 @@ beginning of local filename are not substituted."
   "Like `insert-file-contents' for Tramp files."
   (barf-if-buffer-read-only)
   (setq filename (expand-file-name filename))
-  (with-parsed-tramp-file-name filename nil
-    (if (not (file-exists-p filename))
-        (progn
-          (when visit
-            (setq buffer-file-name filename)
-            (set-visited-file-modtime)
-            (set-buffer-modified-p nil))
-          (tramp-error
-           v 'file-error "File %s not found on remote host" filename)
-          (list (expand-file-name filename) 0))
-      ;; `insert-file-contents-literally' takes care to avoid calling
-      ;; jka-compr.  By let-binding inhibit-file-name-operation, we
-      ;; propagate that care to the file-local-copy operation.
-      (let ((local-copy
-             (let ((inhibit-file-name-operation
-                    (when (eq inhibit-file-name-operation
-                              'insert-file-contents)
-                      'file-local-copy)))
-               (file-local-copy filename)))
-            coding-system-used result)
-        (tramp-message v 4 "Inserting local temp file `%s'..." local-copy)
-        (setq result (insert-file-contents local-copy nil beg end replace))
+  (let (coding-system-used result)
+    (with-parsed-tramp-file-name filename nil
+
+      (if (not (file-exists-p filename))
+          (progn
+            (when visit
+              (setq buffer-file-name filename)
+              (set-visited-file-modtime)
+              (set-buffer-modified-p nil))
+            (tramp-error
+             v 'file-error "File %s not found on remote host" filename)
+            (list (expand-file-name filename) 0))
+
+        (if (and (tramp-local-host-p v)
+                 (file-readable-p localname))
+            ;; Short track: if we are on the local host, we can run directly.
+          (insert-file-contents localname visit beg end replace)
+
+          ;; `insert-file-contents-literally' takes care to avoid calling
+          ;; jka-compr.  By let-binding inhibit-file-name-operation, we
+          ;; propagate that care to the file-local-copy operation.
+          (let ((local-copy
+                 (let ((inhibit-file-name-operation
+                        (when (eq inhibit-file-name-operation
+                                  'insert-file-contents)
+                          'file-local-copy)))
+                   (file-local-copy filename))))
+            (tramp-message v 4 "Inserting local temp file `%s'..." local-copy)
+            (setq result (insert-file-contents local-copy nil beg end replace))
+            ;; Now `last-coding-system-used' has right value.  Remember it.
+            (when (boundp 'last-coding-system-used)
+              (setq coding-system-used (symbol-value 'last-coding-system-used)))
+            (tramp-message v 4 "Inserting local temp file `%s'...done" local-copy)
+            (delete-file local-copy)
+            (when (boundp 'last-coding-system-used)
+              (set 'last-coding-system-used coding-system-used))))
+
         (when visit
+          (setq buffer-read-only (file-writable-p filename))
           (setq buffer-file-name filename)
           (set-visited-file-modtime)
           (set-buffer-modified-p nil))
-        ;; Now `last-coding-system-used' has right value.  Remember it.
-        (when (boundp 'last-coding-system-used)
-          (setq coding-system-used (symbol-value 'last-coding-system-used)))
-        (tramp-message v 4 "Inserting local temp file `%s'...done" local-copy)
-        (delete-file local-copy)
-        (when (boundp 'last-coding-system-used)
-          (set 'last-coding-system-used coding-system-used))
         (list (expand-file-name filename)
               (cadr result))))))
 
-
 (defun tramp-handle-find-backup-file-name (filename)
   "Like `find-backup-file-name' for Tramp files."
   (with-parsed-tramp-file-name filename nil
@@ -3892,10 +4021,12 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file."
     ;;              (string= lockname filename))
     ;;    (error
     ;;     "tramp-handle-write-region: LOCKNAME must be nil or equal FILENAME"))
+
     ;; XEmacs takes a coding system as the seventh argument, not `confirm'
     (when (and (not (featurep 'xemacs)) confirm (file-exists-p filename))
       (unless (y-or-n-p (format "File %s exists; overwrite anyway? " filename))
         (tramp-error v 'file-error "File not overwritten")))
+
     (let ((rem-dec (tramp-get-remote-coding v "remote-decoding"))
           (loc-enc (tramp-get-local-coding v "local-encoding"))
           (modes (save-excursion (file-modes filename)))
@@ -3910,146 +4041,148 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file."
           ;; use an encoding function, but currently we use it always
           ;; because this makes the logic simpler.
           (tmpfil (tramp-make-temp-file filename)))
-      ;; We say `no-message' here because we don't want the visited file
-      ;; modtime data to be clobbered from the temp file.  We call
-      ;; `set-visited-file-modtime' ourselves later on.
-      (tramp-run-real-handler
-       'write-region
-       (if confirm ; don't pass this arg unless defined for backward compat.
-           (list start end tmpfil append 'no-message lockname confirm)
-         (list start end tmpfil append 'no-message lockname)))
-      ;; Now, `last-coding-system-used' has the right value.  Remember it.
-      (when (boundp 'last-coding-system-used)
-        (setq coding-system-used (symbol-value 'last-coding-system-used)))
-      ;; The permissions of the temporary file should be set.  If
-      ;; filename does not exist (eq modes nil) it has been renamed to
-      ;; the backup file.  This case `save-buffer' handles
-      ;; permissions.
-      (when modes (set-file-modes tmpfil modes))
-
-      ;; This is a bit lengthy due to the different methods possible for
-      ;; file transfer.  First, we check whether the method uses an rcp
-      ;; program.  If so, we call it.  Otherwise, both encoding and
-      ;; decoding command must be specified.  However, if the method
-      ;; _also_ specifies an encoding function, then that is used for
-      ;; encoding the contents of the tmp file.
-      (cond ;; Fast track on local machine.
-            ((tramp-local-host-p v)
-             (tramp-do-copy-or-rename-file-directly
-              'rename v tmpfil localname t))
-
-            ;; `copy-file' handles out-of-band methods
-            ((and (tramp-method-out-of-band-p v)
-                  (integerp start)
-                  (> (- end start) tramp-copy-size-limit))
-             (rename-file tmpfil filename t))
-
-            ;; Use inline file transfer
-            (rem-dec
-             ;; Encode tmpfil
-             (tramp-message v 5 "Encoding region...")
-             (unwind-protect
-                 (with-temp-buffer
-                   ;; Use encoding function or command.
-                   (if (and (symbolp loc-enc) (fboundp loc-enc))
-                       (progn
-                         (tramp-message
-                          v 5 "Encoding region using function `%s'..."
-                          (symbol-name loc-enc))
-                         (let ((coding-system-for-read 'binary))
-                           (insert-file-contents-literally tmpfil))
-                         ;; CCC.  The following `let' is a workaround for
-                         ;; the base64.el that comes with pgnus-0.84.  If
-                         ;; both of the following conditions are
-                         ;; satisfied, it tries to write to a local file
-                         ;; in default-directory, but at this point,
-                         ;; default-directory is remote.
-                         ;; (CALL-PROCESS-REGION can't write to remote
-                         ;; files, it seems.)  The file in question is a
-                         ;; tmp file anyway.
-                         (let ((default-directory
-                                 (tramp-temporary-file-directory)))
-                           (funcall loc-enc (point-min) (point-max))))
-
-                     (tramp-message
-                      v 5 "Encoding region using command `%s'..." loc-enc)
-                     (unless (equal 0 (tramp-call-local-coding-command
-                                       loc-enc tmpfil t))
-                       (tramp-error
-                        v 'file-error
-                        (concat "Cannot write to `%s', local encoding"
-                                " command `%s' failed")
-                        filename loc-enc)))
-
-                   ;; Send buffer into remote decoding command which
-                   ;; writes to remote file.  Because this happens on the
-                   ;; remote host, we cannot use the function.
-                   (goto-char (point-max))
-                   (unless (bolp) (newline))
-                   (tramp-message
-                    v 5 "Decoding region into remote file %s..." filename)
-                   (tramp-send-command
-                    v
-                    (format
-                     "%s >%s <<'EOF'\n%sEOF"
-                     rem-dec
-                     (tramp-shell-quote-argument localname)
-                     (buffer-string)))
-                   (tramp-barf-unless-okay
-                    v nil
-                    (concat "Couldn't write region to `%s',"
-                            " decode using `%s' failed")
-                    filename rem-dec)
-                   ;; When `file-precious-flag' is set, the region is
-                   ;; written to a temporary file.  Check that the
-                   ;; checksum is equal to that from the local tmpfil.
-                   (when file-precious-flag
-                     (erase-buffer)
-                     (and
-                      ;; cksum runs locally
+
+      (if (and (tramp-local-host-p v)
+               (file-writable-p (file-name-directory localname)))
+          ;; Short track: if we are on the local host, we can run directly.
+          (if confirm
+              (write-region
+               start end localname append 'no-message lockname confirm)
+            (write-region start end localname append 'no-message lockname))
+
+        ;; We say `no-message' here because we don't want the visited file
+        ;; modtime data to be clobbered from the temp file.  We call
+        ;; `set-visited-file-modtime' ourselves later on.
+        (tramp-run-real-handler
+         'write-region
+         (if confirm ; don't pass this arg unless defined for backward compat.
+             (list start end tmpfil append 'no-message lockname confirm)
+           (list start end tmpfil append 'no-message lockname)))
+        ;; Now, `last-coding-system-used' has the right value.  Remember it.
+        (when (boundp 'last-coding-system-used)
+          (setq coding-system-used (symbol-value 'last-coding-system-used)))
+        ;; The permissions of the temporary file should be set.  If
+        ;; filename does not exist (eq modes nil) it has been renamed to
+        ;; the backup file.  This case `save-buffer' handles
+        ;; permissions.
+        (when modes (set-file-modes tmpfil modes))
+
+        ;; This is a bit lengthy due to the different methods possible for
+        ;; file transfer.  First, we check whether the method uses an rcp
+        ;; program.  If so, we call it.  Otherwise, both encoding and
+        ;; decoding command must be specified.  However, if the method
+        ;; _also_ specifies an encoding function, then that is used for
+        ;; encoding the contents of the tmp file.
+        (cond
+         ;; `rename-file' handles direct copy and out-of-band methods.
+         ((or (tramp-local-host-p v)
+              (and (tramp-method-out-of-band-p v)
+                   (integerp start)
+                   (> (- end start) tramp-copy-size-limit)))
+          (rename-file tmpfil filename t))
+
+         ;; Use inline file transfer
+         (rem-dec
+          ;; Encode tmpfil
+          (tramp-message v 5 "Encoding region...")
+          (unwind-protect
+              (with-temp-buffer
+                ;; Use encoding function or command.
+                (if (and (symbolp loc-enc) (fboundp loc-enc))
+                    (progn
+                      (tramp-message
+                       v 5 "Encoding region using function `%s'..."
+                       (symbol-name loc-enc))
+                      (let ((coding-system-for-read 'binary))
+                        (insert-file-contents-literally tmpfil))
+                      ;; CCC.  The following `let' is a workaround for
+                      ;; the base64.el that comes with pgnus-0.84.  If
+                      ;; both of the following conditions are
+                      ;; satisfied, it tries to write to a local file
+                      ;; in default-directory, but at this point,
+                      ;; default-directory is remote.
+                      ;; (CALL-PROCESS-REGION can't write to remote
+                      ;; files, it seems.)  The file in question is a
+                      ;; tmp file anyway.
                       (let ((default-directory
                               (tramp-temporary-file-directory)))
-                        (zerop (call-process "cksum" tmpfil t)))
-                      ;; cksum runs remotely
-                      (zerop
-                       (tramp-send-command-and-check
-                        v
-                        (format
-                         "cksum <%s"
-                         (tramp-shell-quote-argument localname))))
-                      ;; ... they are different
-                      (not
-                       (string-equal
-                        (buffer-string)
-                        (with-current-buffer (tramp-get-buffer v)
-                          (buffer-string))))
-                      (tramp-error
-                       v 'file-error
-                       (concat "Couldn't write region to `%s',"
-                               " decode using `%s' failed")
-                       filename rem-dec)))
-                   (tramp-message
-                    v 5 "Decoding region into remote file %s...done" filename)
-                   (tramp-flush-file-property v localname))
-
-               ;; Save exit.
-               (delete-file tmpfil)))
-
-            ;; That's not expected.
-            (t
-             (tramp-error
-              v 'file-error
-              (concat "Method `%s' should specify both encoding and "
-                      "decoding command or an rcp program")
-              method)))
+                        (funcall loc-enc (point-min) (point-max))))
+
+                  (tramp-message
+                   v 5 "Encoding region using command `%s'..." loc-enc)
+                  (unless (equal 0 (tramp-call-local-coding-command
+                                    loc-enc tmpfil t))
+                    (tramp-error
+                     v 'file-error
+                     "Cannot write to `%s', local encoding command `%s' failed"
+                     filename loc-enc)))
+
+                ;; Send buffer into remote decoding command which
+                ;; writes to remote file.  Because this happens on the
+                ;; remote host, we cannot use the function.
+                (goto-char (point-max))
+                (unless (bolp) (newline))
+                (tramp-message
+                 v 5 "Decoding region into remote file %s..." filename)
+                (tramp-send-command
+                 v
+                 (format
+                  "%s >%s <<'EOF'\n%sEOF"
+                  rem-dec
+                  (tramp-shell-quote-argument localname)
+                  (buffer-string)))
+                (tramp-barf-unless-okay
+                 v nil
+                 "Couldn't write region to `%s', decode using `%s' failed"
+                 filename rem-dec)
+                ;; When `file-precious-flag' is set, the region is
+                ;; written to a temporary file.  Check that the
+                ;; checksum is equal to that from the local tmpfil.
+                (when file-precious-flag
+                  (erase-buffer)
+                  (and
+                   ;; cksum runs locally
+                   (let ((default-directory (tramp-temporary-file-directory)))
+                     (zerop (call-process "cksum" tmpfil t)))
+                   ;; cksum runs remotely
+                   (zerop
+                    (tramp-send-command-and-check
+                     v
+                     (format "cksum <%s" (tramp-shell-quote-argument localname))))
+                   ;; ... they are different
+                   (not
+                    (string-equal
+                     (buffer-string)
+                     (with-current-buffer (tramp-get-buffer v) (buffer-string))))
+                   (tramp-error
+                    v 'file-error
+                    (concat "Couldn't write region to `%s',"
+                            " decode using `%s' failed")
+                    filename rem-dec)))
+                (tramp-message
+                 v 5 "Decoding region into remote file %s...done" filename)
+                (tramp-flush-file-property v localname))
+
+            ;; Save exit.
+            (delete-file tmpfil)))
+
+         ;; That's not expected.
+         (t
+          (tramp-error
+           v 'file-error
+           (concat "Method `%s' should specify both encoding and "
+                   "decoding command or an rcp program")
+           method))))
 
       (when (or (eq visit t) (stringp visit))
         (set-visited-file-modtime
          ;; We must pass modtime explicitely, because filename can be different
          ;; from (buffer-file-name), f.e. if `file-precious-flag' is set.
          (nth 5 (file-attributes filename))))
+      ;; Set the ownership.
+      (tramp-set-file-uid-gid filename)
       ;; Make `last-coding-system-used' have the right value.
-      (when (boundp 'last-coding-system-used)
+      (when coding-system-used
         (set 'last-coding-system-used coding-system-used))
       (when (or (eq visit t) (null visit) (stringp visit))
         (tramp-message v 0 "Wrote %s" filename))
@@ -5917,6 +6050,7 @@ connection if a previous connection has died for some reason."
       (let* ((target-alist (tramp-compute-multi-hops vec))
              (process-environment (copy-sequence process-environment))
              (process-connection-type tramp-process-connection-type)
+             (process-adaptive-read-buffering nil)
              (coding-system-for-read nil)
              ;; This must be done in order to avoid our file name handler.
              (p (let ((default-directory (tramp-temporary-file-directory)))
@@ -6705,6 +6839,12 @@ necessary only.  This function will be used in file name completion."
       ;; The command might not always return a number.
       (if (and (equal id-format 'integer) (not (integerp res))) -1 res))))
 
+(defun tramp-get-local-uid (id-format)
+  (if (equal id-format 'integer) (user-uid) (user-login-name)))
+
+(defun tramp-get-local-gid (id-format)
+  (nth 3 (file-attributes "~/" id-format)))
+
 ;; Some predefined connection properties.
 (defun tramp-get-remote-coding (vec prop)
   ;; Local coding handles properties like remote coding.  So we could