andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* trampver.el:

Browse source 
* trampver.texi: Downgrade version to 2.2.6-24.3, in order to
distinguish from trunk.

Don't merge with trunk, please.
This commit is contained in:
Michael Albinus 2012-11-20 10:29:47 +01:00
parent 1faaca8ac8
commit 555ccdc215
4 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/misc/ChangeLog
View file

@ -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.

2
doc/misc/trampver.texi
View file

@ -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

5
lisp/ChangeLog
View file

@ -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

4
lisp/net/trampver.el
View file

@ -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)))