From 96fc3f0d27935b528713d8e5e72caae5ecc36ecc Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 25 Sep 2024 19:43:07 +0200 Subject: [PATCH] Fix Tramp shortdoc integration * lisp/net/tramp-integration.el (tramp-syntax): Declare. (shortdoc): Check, that Tramp has `default' syntax. (cherry picked from commit d63bff4d88f32c31fa16f313f11ad2ab7485d4f9) --- lisp/net/tramp-integration.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/net/tramp-integration.el b/lisp/net/tramp-integration.el index af48714980f..0a99711d222 100644 --- a/lisp/net/tramp-integration.el +++ b/lisp/net/tramp-integration.el @@ -54,6 +54,7 @@ (defvar shortdoc--groups) (defvar tramp-current-connection) (defvar tramp-postfix-host-format) +(defvar tramp-syntax) (defvar tramp-use-connection-share) ;;; Fontification of `read-file-name': @@ -304,7 +305,8 @@ It's value must be a Tramp user option, indexed in the Tramp manual via (tramp--with-startup (with-eval-after-load 'shortdoc ;; Some packages deactivate Tramp. They don't deserve a shortdoc entry then. - (when (file-remote-p "/ssh:user@host:/tmp/foo") + (when (and (file-remote-p "/ssh:user@host:/tmp/foo") + (eq tramp-syntax 'default)) (dolist (elem `((file-remote-p :eval (file-remote-p "/ssh:user@host:/tmp/foo") :eval (file-remote-p "/ssh:user@host:/tmp/foo" 'method) -- 2.39.5