From 1d2b386ec4dcd8a5844fae3173ba454a51999a56 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 22 Oct 2018 09:05:48 +0200
Subject: [PATCH] Improve Tramp backward compatibility

* lisp/net/tramp-compat.el: (tramp-unload-file-name-handlers):
Declare it, for backward compatibility.
---
 lisp/net/tramp-compat.el | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index c3777e6e737..ec8e54509d1 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -29,6 +29,11 @@
 
 ;;; Code:
 
+;; In Emacs 24 and 25, `tramp-unload-file-name-handlers' is not
+;; autoloaded.  So we declare it here in order to avoid recursive
+;; load.  This will be overwritten in tramp.el.
+(defun tramp-unload-file-name-handlers ())
+
 (require 'auth-source)
 (require 'advice)
 (require 'cl-lib)
-- 
2.39.5