From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 27 Apr 2021 18:56:07 +0000 (+0200)
Subject: Fix loading problem in Tramp
X-Git-Tag: emacs-28.0.90~2687
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1ee62ac5bd943f7f2803e66d63ccf78113d31fa0;p=emacs.git

Fix loading problem in Tramp

* lisp/net/tramp.el (tramp-autoload-file-name-handler): Load also
tramp-compat.el.
---

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index dc34b8f024d..88af9afd98a 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)))