[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master f270191 3/3: Bump Tramp version to 2.4.1-pre
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master f270191 3/3: Bump Tramp version to 2.4.1-pre |
Date: |
Mon, 27 Aug 2018 10:46:00 -0400 (EDT) |
branch: master
commit f2701917e28b2aca6d98d8214e5ef2ff648a11f8
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
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.
---
doc/misc/trampver.texi | 2 +-
lisp/net/tramp.el | 3 +--
lisp/net/trampver.el | 11 +++++------
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 6d02b04..807330b 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -8,7 +8,7 @@
@c In the Tramp GIT, 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.
address@hidden trampver 2.4.0
address@hidden trampver 2.4.1-pre
@c Other flags from configuration
@set instprefix /usr/local
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 457fd7f..0033f2c 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 9bc8768..1956ab6 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -7,7 +7,6 @@
;; Maintainer: Michael Albinus <address@hidden>
;; 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.