From cd339e85a695f40d93b5ce9f4e65075dd979b25b Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 29 Jun 2021 17:15:55 +0200 Subject: Sync with Tramp 2.5.1 * doc/misc/trampver.texi: * lisp/net/trampver.el: Change version to "2.5.1". * lisp/tramp.el (tramp-handle-write-region): * lisp/tramp-adb.el (tramp-adb-handle-write-region): * lisp/tramp-sh.el (tramp-sh-handle-write-region): Call local `write-region' directly. * test/lisp/net/tramp-tests.el (tramp--test-utf8): Adapt test for MS Windows. --- doc/misc/trampver.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/misc/trampver.texi') diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index 827c4773285..10c951d3ccf 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -8,7 +8,7 @@ @c In the Tramp GIT, the version numbers are auto-frobbed from @c tramp.el, and the bug report address is auto-frobbed from @c configure.ac. -@set trampver 2.5.1-pre +@set trampver 2.5.1 @set trampurl https://www.gnu.org/software/tramp/ @set tramp-bug-report-address tramp-devel@@gnu.org @set emacsver 25.1 -- cgit v1.2.3 From 55a9c17cef78b1fd3da42bcc2ab55d4acbaa24eb Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Fri, 30 Jul 2021 17:19:29 +0200 Subject: Change Tramp version to "2.5.2-pre" * doc/misc/trampver.texi: * lisp/net/trampver.el: Change version to "2.5.2-pre". --- doc/misc/trampver.texi | 2 +- lisp/net/trampver.el | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'doc/misc/trampver.texi') diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index 10c951d3ccf..b11ee39f884 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -8,7 +8,7 @@ @c In the Tramp GIT, the version numbers are auto-frobbed from @c tramp.el, and the bug report address is auto-frobbed from @c configure.ac. -@set trampver 2.5.1 +@set trampver 2.5.2-pre @set trampurl https://www.gnu.org/software/tramp/ @set tramp-bug-report-address tramp-devel@@gnu.org @set emacsver 25.1 diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index e6cf4c6ac53..8ad641ee45b 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -7,7 +7,7 @@ ;; Maintainer: Michael Albinus ;; Keywords: comm, processes ;; Package: tramp -;; Version: 2.5.1 +;; Version: 2.5.2-pre ;; Package-Requires: ((emacs "25.1")) ;; Package-Type: multi ;; URL: https://www.gnu.org/software/tramp/ @@ -40,7 +40,7 @@ ;; ./configure" to change them. ;;;###tramp-autoload -(defconst tramp-version "2.5.1" +(defconst tramp-version "2.5.2-pre" "This version of Tramp.") ;;;###tramp-autoload @@ -76,7 +76,7 @@ ;; Check for Emacs version. (let ((x (if (not (string-lessp emacs-version "25.1")) "ok" - (format "Tramp 2.5.1 is not fit for %s" + (format "Tramp 2.5.2-pre is not fit for %s" (replace-regexp-in-string "\n" "" (emacs-version)))))) (unless (string-equal "ok" x) (error "%s" x))) -- cgit v1.2.3