[elpa] externals/tramp 7d4fea1: Rearrage autoload of tramp-compat.el

[Michael Albinus]

branch: externals/tramp
commit 7d4fea1e93108e77b9030821c22e8ebd8a782e80
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    Rearrage autoload of tramp-compat.el
---
 tramp.el | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tramp.el b/tramp.el
index 1723fa5..2140732 100644
--- a/tramp.el
+++ b/tramp.el
@@ -64,6 +64,11 @@
 (declare-function netrc-parse "netrc")
 (defvar auto-save-file-name-transforms)
 
+;; Reload `tramp-compat` when we reload `tramp-autoloads' of the GNU
+;; ELPA package.
+;;;###autoload (when (featurep 'tramp-compat)
+;;;###autoload   (load "tramp-compat" 'noerror 'nomessage)
+
 ;;; User Customizable Internal Variables:
 
 (defgroup tramp nil
@@ -2581,15 +2586,12 @@ Falls back to normal file name handler if no Tramp file 
name handler exists."
     ;; might be an older, incompatible version active.  We try to
     ;; overload this.
     (let ((default-directory temporary-file-directory))
-      (load "tramp-compat" 'noerror 'nomessage)
       (load "tramp" 'noerror 'nomessage)))
   (apply operation args)))
 
 ;; `tramp-autoload-file-name-handler' must be registered before
 ;; evaluation of site-start and init files, because there might exist
-;; remote files already, f.e. files kept via recentf-mode.  We must
-;; also handle the case that autoloads are revaluated, for example
-;; when installing Tramp as GNU ELPA package.
+;; remote files already, f.e. files kept via recentf-mode.
 ;;;###autoload
 (progn (defun tramp-register-autoload-file-name-handlers ()
   "Add Tramp file name handlers to `file-name-handler-alist' during autoload."