Merge from emacs-23

[gnu-emacs] / lisp / net / trampver.el

diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 80e06121f836ba7f4490c950d878fd3a83b3f86f..e58fe01ee32ad663e4909a28475dc9ed416a1687 100644 (file)
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -6,6 +6,7 @@
 
 ;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
 ;; Keywords: comm, processes
+;; Package: tramp
 
 ;; This file is part of GNU Emacs.
 
@@ -30,19 +31,31 @@
 ;; version check is defined in macro AC_EMACS_INFO of aclocal.m4;
 ;; should be changed only there.
 
-(defconst tramp-version "2.1.20"
+;;;###tramp-autoload
+(defconst tramp-version "2.2.1-pre"
   "This version of Tramp.")
 
+;;;###tramp-autoload
 (defconst tramp-bug-report-address "tramp-devel@gnu.org"
   "Email address to send bug reports to.")
 
 ;; Check for (X)Emacs version.
-(let ((x (if (or (>= emacs-major-version 22)   (and (featurep 'xemacs)      (= emacs-major-version 21)      (>= emacs-minor-version 4)))    "ok"    (format "Tramp 2.1.20 is not fit for %s"       (when (string-match "^.*$" (emacs-version))       (match-string 0 (emacs-version)))))))
+(let ((x (if (or (>= emacs-major-version 22)
+                (and (featurep 'xemacs)
+                     (= emacs-major-version 21)
+                     (>= emacs-minor-version 4)))
+            "ok"
+          (format "Tramp 2.2.1-pre is not fit for %s"
+                  (when (string-match "^.*$" (emacs-version))
+                    (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))
 
+(add-hook 'tramp-unload-hook
+         (lambda ()
+           (unload-feature 'trampver 'force)))
+
 (provide 'trampver)
 
-;; arch-tag: 443576ca-f8f1-4bb1-addc-5c70861e93b1
 ;;; trampver.el ends here
 
 ;; Local Variables: