Mercurial > emacs
changeset 111647:7d109d8678c8
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 | 71b9e27e5245 |
| children | 484f65f4313c |
| files | lisp/ChangeLog lisp/net/tramp-sh.el lisp/net/tramp.el lisp/net/trampver.el |
| diffstat | 4 files changed, 27 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Nov 20 13:52:09 2010 +0200 +++ b/lisp/ChangeLog Sat Nov 20 14:12:27 2010 +0100 @@ -1,3 +1,15 @@ +2010-11-20 Michael Albinus <michael.albinus@gmx.de> + + 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. + 2010-11-20 Eli Zaretskii <eliz@gnu.org> * faces.el (glyphless-char): Define value for `pc'.
--- a/lisp/net/tramp-sh.el Sat Nov 20 13:52:09 2010 +0200 +++ b/lisp/net/tramp-sh.el Sat Nov 20 14:12:27 2010 +0100 @@ -106,7 +106,8 @@ ;;;###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 @@ (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 @@ (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 @@ ;; 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
--- 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)))
--- a/lisp/net/trampver.el Sat Nov 20 13:52:09 2010 +0200 +++ b/lisp/net/trampver.el Sat Nov 20 14:12:27 2010 +0100 @@ -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: