Improve Tramp startup time

* lisp/net/tramp-cmds.el (tramp-repository-branch)
(tramp-repository-version):
* lisp/net/tramp-message.el (tramp-repository-branch)
(tramp-repository-version): Declare.

* lisp/net/trampver.el (tramp-repository-branch)
(tramp-repository-version): Remove ;;;###tramp-autoload cookie.

3 files changed, 4 insertions, 2 deletions

diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index 09c48db0562..866532041c5 100644
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -39,6 +39,8 @@
 (defvar mm-7bit-chars)
 (defvar reporter-eval-buffer)
 (defvar reporter-prompt-for-summary-p)
+(defvar tramp-repository-branch)
+(defvar tramp-repository-version)
 
 ;;;###tramp-autoload
 (defun tramp-change-syntax (&optional syntax)
diff --git a/lisp/net/tramp-message.el b/lisp/net/tramp-message.el
index df3e9c2a616..5e1c9904aa7 100644
--- a/lisp/net/tramp-message.el
+++ b/lisp/net/tramp-message.el
@@ -53,6 +53,8 @@
 (declare-function tramp-file-name-host-port "tramp")
 (declare-function tramp-file-name-user-domain "tramp")
 (declare-function tramp-get-default-directory "tramp")
+(defvar tramp-repository-branch)
+(defvar tramp-repository-version)
 
 ;;;###tramp-autoload
 (defcustom tramp-verbose 3
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 2ffea846ecb..894b05814af 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -47,7 +47,6 @@
 (defconst tramp-bug-report-address "tramp-devel@gnu.org"
   "Email address to send bug reports to.")
 
-;;;###tramp-autoload
 (defconst tramp-repository-branch
   (ignore-errors
     ;; Suppress message from `emacs-repository-get-branch'.  We must
@@ -61,7 +60,6 @@
            (emacs-repository-get-branch dir))))
   "The repository branch of the Tramp sources.")
 
-;;;###tramp-autoload
 (defconst tramp-repository-version
   (ignore-errors
     ;; Suppress message from `emacs-repository-get-version'.  We must