diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2010-11-20 14:12:27 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2010-11-20 14:12:27 +0100 |
| commit | 7398933f95c5bfefa37160a65ca793ed58fdd868 (patch) | |
| tree | 65625071c1aad84a16b01d435895009ee8d8473c /lisp/net/trampver.el | |
| parent | 26214810c2aa9179baeb34c4b48fb39044db2bfd (diff) | |
| download | emacs-7398933f95c5bfefa37160a65ca793ed58fdd868.tar.gz | |
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.
Diffstat (limited to 'lisp/net/trampver.el')
| -rw-r--r-- | lisp/net/trampver.el | 5 |
1 files changed, 2 insertions, 3 deletions
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: |