aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2010-11-05 21:52:50 +0100
committerMichael Albinus2010-11-05 21:52:50 +0100
commitfe9c5521a30cf8fa64323e704f87e70ae5cb8353 (patch)
tree41ea8cdf418b75e78c4a1ab7a9c65c1f3823d059
parentbe3faa809a959dcd7e985a0d536ac815d5138976 (diff)
downloademacs-fe9c5521a30cf8fa64323e704f87e70ae5cb8353.tar.gz
emacs-fe9c5521a30cf8fa64323e704f87e70ae5cb8353.zip
* net/trampver.el: Update release number.
This shall not be merged into the trunk.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/trampver.el4
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 @@
12010-11-05 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/trampver.el: Update release number.
4
12010-08-01 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 52010-08-01 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 6
3 * mouse.el (mouse-fixup-help-message): Match "mouse-2" only at the 7 * 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 @@
30;; version check is defined in macro AC_EMACS_INFO of aclocal.m4; 30;; version check is defined in macro AC_EMACS_INFO of aclocal.m4;
31;; should be changed only there. 31;; should be changed only there.
32 32
33(defconst tramp-version "2.1.20-pre" 33(defconst tramp-version "2.1.20"
34 "This version of Tramp.") 34 "This version of Tramp.")
35 35
36(defconst tramp-bug-report-address "tramp-devel@gnu.org" 36(defconst tramp-bug-report-address "tramp-devel@gnu.org"
37 "Email address to send bug reports to.") 37 "Email address to send bug reports to.")
38 38
39;; Check for (X)Emacs version. 39;; Check for (X)Emacs version.
40(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))))))) 40(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)))))))
41 (unless (string-match "\\`ok\\'" x) (error "%s" x))) 41 (unless (string-match "\\`ok\\'" x) (error "%s" x)))
42 42
43(provide 'trampver) 43(provide 'trampver)