From ddc734432bdb97480de0c8c80fb5e294b88e9214 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 5 Feb 2022 19:17:47 +0100 Subject: [PATCH] Adapt Tramp to changed unload behavior (bug#53632) * test/lisp/net/tramp-tests.el (tramp-test47-unload): Check also for autoloaded macros. Respect `tramp-autoload' function property. --- test/lisp/net/tramp-tests.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 9be1985780d..a4f2fe9e0e2 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -7205,12 +7205,14 @@ Since it unloads Tramp, it shall be the last test to run." (mapatoms (lambda (x) (and (or (and (boundp x) (null (local-variable-if-set-p x))) - (and (functionp x) (null (autoloadp (symbol-function x))))) + (and (functionp x) (null (autoloadp (symbol-function x)))) + (macrop x)) (string-match-p "^tramp" (symbol-name x)) ;; `tramp-completion-mode' is autoloaded in Emacs < 28.1. (not (eq 'tramp-completion-mode x)) (not (string-match-p "^tramp\\(-archive\\)?--?test" (symbol-name x))) (not (string-match-p "unload-hook$" (symbol-name x))) + (not (get x 'tramp-autoload)) (ert-fail (format "`%s' still bound" x))))) ;; The defstruct `tramp-file-name' and all its internal functions ;; shall be purged. -- 2.39.5