Mercurial > emacs

diff lisp/net/tramp.el @ 111647:7d109d8678c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sync with Tramp 2.2.0. * net/tramp.el (tramp-handle-insert-file-contents): Don't use `file-remote-p' (due to compatibility). * net/tramp-sh.el (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band): Use `ignore-errors'. * net/trampver.el: Update release number.
author Michael Albinus <michael.albinus@gmx.de>
date Sat, 20 Nov 2010 14:12:27 +0100
parents 49c1b16ca6b1
children daaca509a6d8
line wrap: on
line diff
--- a/lisp/net/tramp.el	Sat Nov 20 13:52:09 2010 +0200
+++ b/lisp/net/tramp.el	Sat Nov 20 14:12:27 2010 +0100
@@ -2863,7 +2863,9 @@
 	    (set-visited-file-modtime)
 	    (set-buffer-modified-p nil)
 	    ;; For root, preserve owner and group when editing files.
-	    (when (string-equal (file-remote-p filename 'user) "root")
+	    (when (string-equal
+		   (tramp-file-name-handler 'file-remote-p filename 'user)
+		   "root")
 	      (set (make-local-variable 'backup-by-copying-when-mismatch) t)))
 	  (when (and (stringp local-copy)
 		     (or remote-copy (null tramp-temp-buffer-file-name)))