aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2018-08-27 16:45:50 +0200
committerMichael Albinus2018-08-27 16:45:50 +0200
commitf2701917e28b2aca6d98d8214e5ef2ff648a11f8 (patch)
tree43eaaf4607f34249b54517da6660275337b2149f
parentc61fbc529343194923ca11dfe10e9afb8b2546d3 (diff)
downloademacs-f2701917e28b2aca6d98d8214e5ef2ff648a11f8.tar.gz
emacs-f2701917e28b2aca6d98d8214e5ef2ff648a11f8.zip
Bump Tramp version to 2.4.1-pre
* doc/misc/trampver.texi: * lisp/net/trampver.el: Change version to "2.4.1-pre". * lisp/net/tramp.el: Add "Package-Requires" header.
-rw-r--r--doc/misc/trampver.texi2
-rw-r--r--lisp/net/tramp.el3
-rw-r--r--lisp/net/trampver.el11
3 files changed, 7 insertions, 9 deletions
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 6d02b043b64..807330bb9b1 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -8,7 +8,7 @@
8@c In the Tramp GIT, the version number is auto-frobbed from 8@c In the Tramp GIT, the version number is auto-frobbed from
9@c configure.ac, so you should edit that file and run 9@c configure.ac, so you should edit that file and run
10@c "autoconf && ./configure" to change the version number. 10@c "autoconf && ./configure" to change the version number.
11@set trampver 2.4.0 11@set trampver 2.4.1-pre
12 12
13@c Other flags from configuration 13@c Other flags from configuration
14@set instprefix /usr/local 14@set instprefix /usr/local
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 457fd7fbcca..0033f2c1700 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -8,6 +8,7 @@
8;; Keywords: comm, processes 8;; Keywords: comm, processes
9;; Package: tramp 9;; Package: tramp
10;; Version: 2.4.1-pre 10;; Version: 2.4.1-pre
11;; Package-Requires: ((emacs "24.1"))
11 12
12;; This file is part of GNU Emacs. 13;; This file is part of GNU Emacs.
13 14
@@ -36,8 +37,6 @@
36;; Notes: 37;; Notes:
37;; ----- 38;; -----
38;; 39;;
39;; This package only works for Emacs 24.1 and higher.
40;;
41;; Also see the todo list at the bottom of this file. 40;; Also see the todo list at the bottom of this file.
42;; 41;;
43;; The current version of Tramp can be retrieved from the following URL: 42;; The current version of Tramp can be retrieved from the following URL:
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 9bc8768384e..1956ab648b3 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -7,7 +7,6 @@
7;; Maintainer: Michael Albinus <michael.albinus@gmx.de> 7;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
8;; Keywords: comm, processes 8;; Keywords: comm, processes
9;; Package: tramp 9;; Package: tramp
10;; Version: 2.4.0
11 10
12;; This file is part of GNU Emacs. 11;; This file is part of GNU Emacs.
13 12
@@ -33,7 +32,7 @@
33;; should be changed only there. 32;; should be changed only there.
34 33
35;;;###tramp-autoload 34;;;###tramp-autoload
36(defconst tramp-version "2.4.0" 35(defconst tramp-version "2.4.1-pre"
37 "This version of Tramp.") 36 "This version of Tramp.")
38 37
39;;;###tramp-autoload 38;;;###tramp-autoload
@@ -53,10 +52,10 @@
53 (replace-regexp-in-string "\n" "" (buffer-string)))))))) 52 (replace-regexp-in-string "\n" "" (buffer-string))))))))
54 53
55;; Check for Emacs version. 54;; Check for Emacs version.
56(let ((x (if (>= emacs-major-version 24) 55(let ((x (if (not (string-lessp emacs-version "24.1"))
57 "ok" 56 "ok"
58 (format "Tramp 2.4.0 is not fit for %s" 57 (format "Tramp 2.4.1-pre is not fit for %s"
59 (replace-regexp-in-string "\n" "" (emacs-version)))))) 58 (replace-regexp-in-string "\n" "" (emacs-version))))))
60 (unless (string-equal "ok" x) (error "%s" x))) 59 (unless (string-equal "ok" x) (error "%s" x)))
61 60
62;; Tramp versions integrated into Emacs. 61;; Tramp versions integrated into Emacs.