* net/trampver.el: Update release number.

This shall not be merged into the trunk.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bfe571f03154a5bc8f6644b997dd11b55ab2c4e..554fe267d4961fadb648b0dfcdb8481971d77cf6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-05  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/trampver.el: Update release number.
+
 2010-08-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * mouse.el (mouse-fixup-help-message): Match "mouse-2" only at the

diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index f8b0a8455a49318109cf4e724092b2ddee556da7..ab9a8acba1e26478c93f8e24a993d210b8733a39 100644 (file)
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -30,14 +30,14 @@
 ;; version check is defined in macro AC_EMACS_INFO of aclocal.m4;
 ;; should be changed only there.
 
-(defconst tramp-version "2.1.20-pre"
+(defconst tramp-version "2.1.20"
   "This version of Tramp.")
 
 (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-pre 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.1.20 is not fit for %s"       (when (string-match "^.*$" (emacs-version))       (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))
 
 (provide 'trampver)