Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
111646:71b9e27e5245 | 111647:7d109d8678c8 |
---|---|
30 ;; file and run "autoconf && ./configure" to change them. (X)Emacs | 30 ;; file and run "autoconf && ./configure" to change them. (X)Emacs |
31 ;; version check is defined in macro AC_EMACS_INFO of aclocal.m4; | 31 ;; version check is defined in macro AC_EMACS_INFO of aclocal.m4; |
32 ;; should be changed only there. | 32 ;; should be changed only there. |
33 | 33 |
34 ;;;###tramp-autoload | 34 ;;;###tramp-autoload |
35 (defconst tramp-version "2.2.0-pre" | 35 (defconst tramp-version "2.2.0" |
36 "This version of Tramp.") | 36 "This version of Tramp.") |
37 | 37 |
38 ;;;###tramp-autoload | 38 ;;;###tramp-autoload |
39 (defconst tramp-bug-report-address "tramp-devel@gnu.org" | 39 (defconst tramp-bug-report-address "tramp-devel@gnu.org" |
40 "Email address to send bug reports to.") | 40 "Email address to send bug reports to.") |
43 (let ((x (if (or (>= emacs-major-version 22) | 43 (let ((x (if (or (>= emacs-major-version 22) |
44 (and (featurep 'xemacs) | 44 (and (featurep 'xemacs) |
45 (= emacs-major-version 21) | 45 (= emacs-major-version 21) |
46 (>= emacs-minor-version 4))) | 46 (>= emacs-minor-version 4))) |
47 "ok" | 47 "ok" |
48 (format "Tramp 2.2.0-pre is not fit for %s" | 48 (format "Tramp 2.2.0 is not fit for %s" |
49 (when (string-match "^.*$" (emacs-version)) | 49 (when (string-match "^.*$" (emacs-version)) |
50 (match-string 0 (emacs-version))))))) | 50 (match-string 0 (emacs-version))))))) |
51 (unless (string-match "\\`ok\\'" x) (error "%s" x))) | 51 (unless (string-match "\\`ok\\'" x) (error "%s" x))) |
52 | 52 |
53 (add-hook 'tramp-unload-hook | 53 (add-hook 'tramp-unload-hook |
54 (lambda () | 54 (lambda () |
55 (unload-feature 'trampver 'force))) | 55 (unload-feature 'trampver 'force))) |
56 | 56 |
57 (provide 'trampver) | 57 (provide 'trampver) |
58 | 58 |
59 ;; arch-tag: 443576ca-f8f1-4bb1-addc-5c70861e93b1 | |
60 ;;; trampver.el ends here | 59 ;;; trampver.el ends here |
61 | 60 |
62 ;; Local Variables: | 61 ;; Local Variables: |
63 ;; mode: Emacs-Lisp | 62 ;; mode: Emacs-Lisp |
64 ;; coding: utf-8 | 63 ;; coding: utf-8 |