From 912c8e36915de656be1927b84736dadc619f3ee7 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 8 Jun 2026 08:45:40 +0200 Subject: [PATCH] Ensure Tramp backward compatibility * lisp/net/tramp.el (tramp-local-environment-variable-p): Use `tramp-compat-funcall'. --- lisp/net/tramp.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 044580bac07..75a8eb16621 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -5478,8 +5478,10 @@ should be set connection-local.") "Return non-nil if ARG exists in default `process-environment'. Tramp does not propagate local environment variables in remote processes." - (or (ignore-error void-variable - (member arg (buffer-local-toplevel-value 'process-environment))) + (or ;; `buffer-local-toplevel-value' has been defined in Emacs 31.1. + (ignore-error (void-variable void-function) + (member arg (tramp-compat-funcall 'buffer-local-toplevel-value + 'process-environment))) (member arg (default-toplevel-value 'process-environment)))) (defun tramp-handle-make-process (&rest args)