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.

(cherry picked from commit 29d4ba56258be582e3f98f1ac1e2a8bb3fc6ae1e)

diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index 09c48db05620a7c4f92b4ffb70e7f6135712800c..866532041c52db0e9f2450288d6170e3e4bb5fa4 100644 (file)
--- 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 737279a9ac0298d8f5eba30cce1c860e5792c652..122efd1f5894afa3240e88f10af80366ce73ac8b 100644 (file)
--- 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 2ffea846ecb6662de3c9c9dba89da3b3441635bb..894b05814af6523deadd3b47464be27f312f80c4 100644 (file)
--- 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