Mercurial > emacs
diff lisp/net/trampver.el @ 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 | ec526909f60b |
| children | 8e746f396237 |
line wrap: on
line diff
--- 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: