master 0a0e1ed0e0 2/5: tramp fixes for byte-compiling loaddefs.el

[Lars Ingebrigtsen]

branch: master
commit 0a0e1ed0e02431827dfd26014d9db9059f1ccc30
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    tramp fixes for byte-compiling loaddefs.el
    
    * lisp/net/tramp-archive.el (tramp-archive-file-name-handler):
    Move to the main loaddefs file since it's referred to by functions
    there.
    * lisp/net/tramp.el (tramp-file-name-handler): Autoload to avoid
    warning when byte-compiling loaddefs.el.
---
 lisp/net/tramp-archive.el | 2 +-
 lisp/net/tramp.el         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el
index 4f106a6b59..b224494110 100644
--- a/lisp/net/tramp-archive.el
+++ b/lisp/net/tramp-archive.el
@@ -322,7 +322,7 @@ arguments to pass to the OPERATION."
         (inhibit-file-name-operation operation))
     (apply operation args))))
 
-;;;###tramp-autoload
+;;;###autoload
 (defun tramp-archive-file-name-handler (operation &rest args)
   "Invoke the file archive related OPERATION.
 First arg specifies the OPERATION, second arg ARGS is a list of
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index faf3182d4a..a808c79dd9 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2684,6 +2684,7 @@ Must be handled by the callers."
       res)))
 
 ;; Main function.
+;;;###autoload
 (defun tramp-file-name-handler (operation &rest args)
   "Invoke Tramp file name handler for OPERATION and ARGS.
 Fall back to normal file name handler if no Tramp file name handler exists."