summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2018-08-27 16:45:50 +0200
committerMichael Albinus <michael.albinus@gmx.de>2018-08-27 16:45:50 +0200
commitf2701917e28b2aca6d98d8214e5ef2ff648a11f8 (patch)
tree43eaaf4607f34249b54517da6660275337b2149f /lisp
parentc61fbc529343194923ca11dfe10e9afb8b2546d3 (diff)
downloademacs-f2701917e28b2aca6d98d8214e5ef2ff648a11f8.tar.gz
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.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/net/tramp.el3
-rw-r--r--lisp/net/trampver.el11
2 files changed, 6 insertions, 8 deletions
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 @@
;; Keywords: comm, processes
;; Package: tramp
;; Version: 2.4.1-pre
+;; Package-Requires: ((emacs "24.1"))
;; This file is part of GNU Emacs.
@@ -36,8 +37,6 @@
;; Notes:
;; -----
;;
-;; This package only works for Emacs 24.1 and higher.
-;;
;; Also see the todo list at the bottom of this file.
;;
;; 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 @@
;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
;; Keywords: comm, processes
;; Package: tramp
-;; Version: 2.4.0
;; This file is part of GNU Emacs.
@@ -33,7 +32,7 @@
;; should be changed only there.
;;;###tramp-autoload
-(defconst tramp-version "2.4.0"
+(defconst tramp-version "2.4.1-pre"
"This version of Tramp.")
;;;###tramp-autoload
@@ -53,10 +52,10 @@
(replace-regexp-in-string "\n" "" (buffer-string))))))))
;; Check for Emacs version.
-(let ((x (if (>= emacs-major-version 24)
- "ok"
- (format "Tramp 2.4.0 is not fit for %s"
- (replace-regexp-in-string "\n" "" (emacs-version))))))
+(let ((x (if (not (string-lessp emacs-version "24.1"))
+ "ok"
+ (format "Tramp 2.4.1-pre is not fit for %s"
+ (replace-regexp-in-string "\n" "" (emacs-version))))))
(unless (string-equal "ok" x) (error "%s" x)))
;; Tramp versions integrated into Emacs.