From e2acb8fef4a40b94f7c43c7548453b997353e006 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 23 Nov 2020 19:54:09 +0100 Subject: [PATCH] Adapt files-x-tests.el according to recent Tramp changes * test/lisp/files-x-tests.el (tramp-connection-local-default-profile): Don't declare. (tramp-connection-local-default-shell-variables) (tramp-connection-local-default-system-variables): Declare. (files-x-test-with-connection-local-variables): Use them. --- test/lisp/files-x-tests.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/lisp/files-x-tests.el b/test/lisp/files-x-tests.el index 9db198384d0..6b05e6a88c3 100644 --- a/test/lisp/files-x-tests.el +++ b/test/lisp/files-x-tests.el @@ -274,7 +274,8 @@ (should-not (local-variable-p 'remote-shell-file-name)) (should-not (boundp 'remote-shell-file-name)))))) -(defvar tramp-connection-local-default-profile) +(defvar tramp-connection-local-default-shell-variables) +(defvar tramp-connection-local-default-system-variables) (ert-deftest files-x-test-with-connection-local-variables () "Test setting connection-local variables." @@ -335,7 +336,10 @@ (append (nreverse (copy-tree files-x-test--variables3)) (nreverse (copy-tree files-x-test--variables2)) - (nreverse (copy-tree tramp-connection-local-default-profile))))) + (nreverse + (copy-tree tramp-connection-local-default-shell-variables)) + (nreverse + (copy-tree tramp-connection-local-default-system-variables))))) ;; The variables exist also as local variables. (should (local-variable-p 'remote-shell-file-name)) (should (local-variable-p 'remote-null-device)) -- 2.39.2