From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 24 Jan 2018 19:49:39 +0000 (-0500)
Subject: * lisp/net/tramp.el: Require trampver here instead of...
X-Git-Tag: emacs-27.0.90~5813
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bb2364205ea4297d5da72716d982cfe8fdf9a0dc;p=emacs.git

* 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 16b56d74ce5..4f564e6eb5c 100644
--- 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 d92d63c67b0..5a2e358daa1 100644
--- 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)