* lisp/net/tramp.el: Require trampver here instead of...

* lisp/net/tramp-compat.el: ... there.

diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index 16b56d74ce50fd77c76e0493accdb1d9cc366b62..4f564e6eb5cbe6e5446ca6b3d2be37b7670623c4 100644 (file)
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -40,7 +40,6 @@
 (require 'timer)
 (require 'ucs-normalize)
 
-(require 'trampver)
 (require 'tramp-loaddefs)
 
 ;; For not existing functions, obsolete functions, or functions with a

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index d92d63c67b0f0d1b3f100e16c6919496eadcfa71..5a2e358daa1b8e443eb22193f4eca30f719ad83d 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -56,6 +56,7 @@
 ;;; Code:
 
 (require 'tramp-compat)
+(require 'trampver)
 
 ;; Pacify byte-compiler.
 (require 'cl-lib)