Minor Tramp changes

* lisp/net/tramp-adb.el:
* lisp/net/tramp-container.el: Add myself as maintainer.

* lisp/net/tramp-compat.el (connection-local-default-application):
Define if not bound.
(tramp-compat-connection-local-p, tramp-compat-connection-local-value):
Use it.
This commit is contained in:
Michael Albinus 2024-06-01 19:22:21 +02:00
parent a154f0aa73
commit f0cd7eab09
3 changed files with 16 additions and 6 deletions

View file

@ -3,6 +3,7 @@
;; Copyright (C) 2011-2024 Free Software Foundation, Inc.
;; Author: Jürgen Hötzel <juergen@archlinux.org>
;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
;; Keywords: comm, processes
;; Package: tramp

View file

@ -304,6 +304,12 @@ Also see `ignore'."
(lambda (function sequence)
(delq nil (seq-map function sequence)))))
;; User option `connection-local-default-application' is new in Emacs 29.1.
(unless (boundp 'connection-local-default-application)
(defvar connection-local-default-application 'tramp
"Default application in connection-local functions, a symbol.
This variable must not be changed globally."))
;; User option `password-colon-equivalents' is new in Emacs 30.1.
(if (boundp 'password-colon-equivalents)
(defvaralias
@ -329,9 +335,10 @@ If APPLICATION is nil, the value of
(declare (debug (symbolp &optional form)))
(unless (symbolp variable)
(signal 'wrong-type-argument (list 'symbolp variable)))
`(let ((criteria
(connection-local-criteria-for-default-directory ,application))
connection-local-variables-alist file-local-variables-alist)
`(let* ((connection-local-default-application
(or ,application connection-local-default-application))
(criteria (connection-local-criteria-for-default-directory))
connection-local-variables-alist file-local-variables-alist)
(when criteria
(hack-connection-local-variables criteria)
(and (assq ',variable connection-local-variables-alist) t)))))
@ -348,9 +355,10 @@ value is the default binding of the variable."
(declare (debug (symbolp &optional form)))
(unless (symbolp variable)
(signal 'wrong-type-argument (list 'symbolp variable)))
`(let ((criteria
(connection-local-criteria-for-default-directory ,application))
connection-local-variables-alist file-local-variables-alist)
`(let* ((connection-local-default-application
(or ,application connection-local-default-application))
(criteria (connection-local-criteria-for-default-directory))
connection-local-variables-alist file-local-variables-alist)
(if (not criteria)
,variable
(hack-connection-local-variables criteria)

View file

@ -3,6 +3,7 @@
;; Copyright © 2022-2024 Free Software Foundation, Inc.
;; Author: Brian Cully <bjc@kublai.com>
;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
;; Keywords: comm, processes
;; Package: tramp