From e5aeb5eaecd5f3a769ac72259ee893353313e610 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 18 Sep 2022 16:53:49 +0200 Subject: [PATCH] Minor Tramp cleanups * lisp/net/tramp-compat.el (tramp-compat-rx): Declare. * lisp/net/tramp-integration.el (info-lookup-maybe-add-help): Fix `rx' call. --- lisp/net/tramp-cache.el | 3 +-- lisp/net/tramp-compat.el | 1 + lisp/net/tramp-integration.el | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index 58954c238e0..d8f31daa1fa 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -43,8 +43,7 @@ ;; existence, or "file-attributes" caches the result of the function ;; `file-attributes'. These entries have a timestamp, and they ;; expire after `remote-file-name-inhibit-cache' seconds if this -;; variable is set. These properties are taken into account only if -;; the connection is established, or `non-essential' is nil. +;; variable is set. ;; ;; - The key is a process. These are temporary properties related to ;; an open connection. Examples: "scripts" keeps shell script diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index aae15fafdf2..a7dd9c03f32 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -36,6 +36,7 @@ (require 'shell) (require 'subr-x) +(declare-function tramp-compat-rx "tramp") (declare-function tramp-error "tramp") (declare-function tramp-file-name-handler "tramp") (declare-function tramp-tramp-file-p "tramp") diff --git a/lisp/net/tramp-integration.el b/lisp/net/tramp-integration.el index 61b2c2ecb7c..b8364b208c3 100644 --- a/lisp/net/tramp-integration.el +++ b/lisp/net/tramp-integration.el @@ -217,12 +217,12 @@ NAME must be equal to `tramp-current-connection'." (info-lookup-maybe-add-help :mode 'tramp-info-lookup-mode :topic 'symbol :regexp (rx (+ (not (any "\t\n \"'(),[]`‘’")))) - :doc-spec '(("(tramp)Function Index" nil - (rx bol blank (+ "-") blank (* nonl) ": ") - (rx (| blank eol))) + :doc-spec `(("(tramp)Function Index" nil + ,(rx bol blank (+ "-") blank (* nonl) ":" blank) + ,(rx (| blank eol))) ("(tramp)Variable Index" nil - (rx bol blank (+ "-") blank (* nonl) ": ") - (rx (| blank eol))))) + ,(rx bol blank (+ "-") blank (* nonl) ":" blank) + ,(rx (| blank eol))))) (add-hook 'tramp-integration-unload-hook -- 2.39.2