aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2018-01-25 12:44:29 +0100
committerMichael Albinus2018-01-25 12:44:29 +0100
commit421e2fb791f6d203642c2d3d0e7e2eb1e66a0ab0 (patch)
tree1873581a6d77bb5f61e09d40508abd5e1212b960
parenta84c3810b56f7bd56d455dfa8962f2e4653ce490 (diff)
downloademacs-421e2fb791f6d203642c2d3d0e7e2eb1e66a0ab0.tar.gz
emacs-421e2fb791f6d203642c2d3d0e7e2eb1e66a0ab0.zip
* lisp/net/trampver.el: Simplify version check.
-rw-r--r--lisp/net/trampver.el5
1 files changed, 2 insertions, 3 deletions
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 @@
56(let ((x (if (>= emacs-major-version 24) 56(let ((x (if (>= emacs-major-version 24)
57 "ok" 57 "ok"
58 (format "Tramp 2.4.0-pre is not fit for %s" 58 (format "Tramp 2.4.0-pre is not fit for %s"
59 (when (string-match "^.*$" (emacs-version)) 59 (replace-regexp-in-string "\n" "" (emacs-version))))))
60 (match-string 0 (emacs-version))))))) 60 (unless (string-equal "ok" x) (error "%s" x)))
61 (unless (string-match "\\`ok\\'" x) (error "%s" x)))
62 61
63;; Tramp versions integrated into Emacs. 62;; Tramp versions integrated into Emacs.
64(add-to-list 63(add-to-list