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.

3 files changed, 15 insertions, 18 deletions

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 5e6cd9577c6..3f503836177 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -106,7 +106,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
 ;;;###tramp-autoload
 (add-to-list
  'tramp-methods
- '("scp"   (tramp-login-program        "ssh")
+ '("scp"
+   (tramp-login-program        "ssh")
    (tramp-login-args           (("-l" "%u") ("-p" "%p")	("-e" "none") ("%h")))
    (tramp-async-args           (("-q")))
    (tramp-remote-sh            "/bin/sh")
@@ -2166,16 +2167,13 @@ the uid and gid from FILENAME."
 		       (list tmpfile localname2 ok-if-already-exists)))))
 
 		;; Save exit.
-		(condition-case nil
-		    (delete-file tmpfile)
-		  (error)))))))))
+		(ignore-errors (delete-file tmpfile)))))))))
 
       ;; Set the time and mode. Mask possible errors.
-      (condition-case nil
+      (ignore-errors
 	  (when keep-date
 	    (set-file-times newname file-times)
-	    (set-file-modes newname file-modes))
-	(error)))))
+	    (set-file-modes newname file-modes))))))
 
 (defun tramp-do-copy-or-rename-file-out-of-band (op filename newname keep-date)
   "Invoke rcp program to copy.
@@ -2203,12 +2201,11 @@ The method used must be an out-of-band method."
 		  (tramp-do-copy-or-rename-file-out-of-band
 		   'rename tmpfile newname keep-date))
 	      ;; Save exit.
-	      (condition-case nil
-		  (if dir-flag
-		      (tramp-compat-delete-directory
-		       (expand-file-name ".." tmpfile) 'recursive)
-		    (delete-file tmpfile))
-		(error))))
+	      (ignore-errors
+		(if dir-flag
+		    (tramp-compat-delete-directory
+		     (expand-file-name ".." tmpfile) 'recursive)
+		  (delete-file tmpfile)))))
 
 	;; Expand hops.  Might be necessary for gateway methods.
 	(setq v (car (tramp-compute-multi-hops v)))
@@ -5039,6 +5036,5 @@ function cell is returned to be applied on a buffer."
 ;;   rsync.
 ;; * Try telnet+curl as new method.  It might be useful for busybox,
 ;;   without built-in uuencode/uudecode.
-;; * Try ssh+netcat as out-of-band method.
 
 ;;; tramp-sh.el ends here
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 2f8eb4dff97..d5b55064f3d 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2863,7 +2863,9 @@ User is always nil."
 	    (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)))
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 7690e859310..c66900dfd09 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -32,7 +32,7 @@
 ;; should be changed only there.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.2.0-pre"
+(defconst tramp-version "2.2.0"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -45,7 +45,7 @@
 		      (= emacs-major-version 21)
 		      (>= emacs-minor-version 4)))
 	     "ok"
-	   (format "Tramp 2.2.0-pre is not fit for %s"
+	   (format "Tramp 2.2.0 is not fit for %s"
 		   (when (string-match "^.*$" (emacs-version))
 		     (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))
@@ -56,7 +56,6 @@
 
 (provide 'trampver)
 
-;; arch-tag: 443576ca-f8f1-4bb1-addc-5c70861e93b1
 ;;; trampver.el ends here
 
 ;; Local Variables: