From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 25 Jan 2018 11:44:29 +0000 (+0100)
Subject: * lisp/net/trampver.el: Simplify version check.
X-Git-Tag: emacs-27.0.90~5811
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=421e2fb791f6d203642c2d3d0e7e2eb1e66a0ab0;p=emacs.git

* lisp/net/trampver.el: Simplify version check.
---

diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index a9c9b0d751b..46af51ebfdb 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -56,9 +56,8 @@
 (let ((x (if (>= emacs-major-version 24)
     "ok"
   (format "Tramp 2.4.0-pre is not fit for %s"
-	  (when (string-match "^.*$" (emacs-version))
-	    (match-string 0 (emacs-version)))))))
-  (unless (string-match "\\`ok\\'" x) (error "%s" x)))
+	  (replace-regexp-in-string "\n" "" (emacs-version))))))
+  (unless (string-equal "ok" x) (error "%s" x)))
 
 ;; Tramp versions integrated into Emacs.
 (add-to-list