diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2012-11-20 10:29:47 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2012-11-20 10:29:47 +0100 |
| commit | 555ccdc2150fa00050ac04d55be15f768f90136c (patch) | |
| tree | 6f7cce0ebba3254b2981c7a71e8c78874e75cb9a | |
| parent | 1faaca8ac8e43c1f9fc2ae80771308b2eb20228f (diff) | |
* trampver.el:
* trampver.texi: Downgrade version to 2.2.6-24.3, in order to
distinguish from trunk.
Don't merge with trunk, please.
| -rw-r--r-- | doc/misc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/misc/trampver.texi | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/trampver.el | 4 |
4 files changed, 13 insertions, 3 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 4a3c8778e88..d82d9699829 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2012-11-20 Michael Albinus <michael.albinus@gmx.de> + + * trampver.texi: Downgrade version to 2.2.6-24.3, in order to + distinguish from trunk. + 2012-11-16 Glenn Morris <rgm@gnu.org> * cl.texi (Function Bindings): Clarify that cl-flet is lexical. diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index 96043a07300..b44f1df2a1e 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -8,7 +8,7 @@ @c In the Tramp CVS, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. -@set trampver 2.2.7-pre +@set trampver 2.2.6-24.3 @c Other flags from configuration @set instprefix /usr/local diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7e9ed2502a7..247222bde21 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-11-20 Michael Albinus <michael.albinus@gmx.de> + + * net/trampver.el (tramp-version): Downgrade to 2.2.6-24.3, in + order to distinguish from trunk. + 2012-11-19 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/byte-run.el (defun-declarations-alist): Don't accept diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 331884691f4..2147f109de9 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -31,7 +31,7 @@ ;; should be changed only there. ;;;###tramp-autoload -(defconst tramp-version "2.2.7-pre" +(defconst tramp-version "2.2.6-24.3" "This version of Tramp.") ;;;###tramp-autoload @@ -44,7 +44,7 @@ (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" - (format "Tramp 2.2.7-pre is not fit for %s" + (format "Tramp 2.2.6-24.3 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) |