diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2010-11-05 21:52:50 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2010-11-05 21:52:50 +0100 |
| commit | fe9c5521a30cf8fa64323e704f87e70ae5cb8353 (patch) | |
| tree | 41ea8cdf418b75e78c4a1ab7a9c65c1f3823d059 | |
| parent | be3faa809a959dcd7e985a0d536ac815d5138976 (diff) | |
| download | emacs-fe9c5521a30cf8fa64323e704f87e70ae5cb8353.tar.gz | |
* net/trampver.el: Update release number.
This shall not be merged into the trunk.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/trampver.el | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5bfe571f031..554fe267d49 100644 --- 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 f8b0a8455a4..ab9a8acba1e 100644 --- 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) |