master 1ee62ac: Fix loading problem in Tramp

[Michael Albinus]

branch: master
commit 1ee62ac5bd943f7f2803e66d63ccf78113d31fa0
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    Fix loading problem in Tramp
    
    * lisp/net/tramp.el (tramp-autoload-file-name-handler): Load also
    tramp-compat.el.
---
 lisp/net/tramp.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index dc34b8f..88af9af 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2564,8 +2564,11 @@ Falls back to normal file name handler if no Tramp file 
name handler exists."
   (tramp-unload-file-name-handlers)
   (when tramp-mode
     ;; We cannot use `tramp-compat-temporary-file-directory' here due
-    ;; to autoload.
+    ;; to autoload.  When installing Tramp's GNU ELPA package, there
+    ;; 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)))