From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 6 Aug 2024 18:25:20 +0000 (+0200)
Subject: * lisp/net/tramp-integration.el (shortdoc): Use `tramp--with-startup'.
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e037b3a0c71425194e28d8dbd67d9c2e15b9bf88;p=emacs.git

* lisp/net/tramp-integration.el (shortdoc): Use `tramp--with-startup'.

(cherry picked from commit f0a7eec5a7ddd4a009d050b97acf29744d576e5d)
---

diff --git a/lisp/net/tramp-integration.el b/lisp/net/tramp-integration.el
index 6b28ddb7472..8d039c25eae 100644
--- a/lisp/net/tramp-integration.el
+++ b/lisp/net/tramp-integration.el
@@ -274,37 +274,38 @@ NAME must be equal to `tramp-current-connection'."
 
 ;;; Integration of shortdoc.el:
 
-(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")
-    (dolist (elem `((file-remote-p
-		     :eval (file-remote-p "/ssh:user@host:/tmp/foo")
-		     :eval (file-remote-p "/ssh:user@host:/tmp/foo" 'method)
-		     :eval (file-remote-p "/ssh:user@[::1]#1234:/tmp/foo" 'host)
-		     ;; We don't want to see the text properties.
-		     :no-eval (file-remote-p "/sudo::/tmp/foo" 'user)
-		     :result ,(substring-no-properties
-			       (file-remote-p "/sudo::/tmp/foo" 'user)))
-		    (file-local-name
-		     :eval (file-local-name "/ssh:user@host:/tmp/foo"))
-		    (file-local-copy
-		     :no-eval (file-local-copy "/ssh:user@host:/tmp/foo")
-		     :eg-result "/tmp/tramp.8ihLbO"
-		     :eval (file-local-copy "/tmp/foo"))))
-      (unless (assoc (car elem)
-		     (member "Remote Files" (assq 'file shortdoc--groups)))
-	(shortdoc-add-function 'file "Remote Files" elem)))
-
-    (add-hook
-     'tramp-integration-unload-hook
-     (lambda ()
-       (let ((glist (assq 'file shortdoc--groups)))
-	 (while (and (consp glist)
-                     (not (and (stringp (cadr glist))
-                               (string-equal (cadr glist) "Remote Files"))))
-           (setq glist (cdr glist)))
-	 (when (consp glist)
-           (setcdr glist nil)))))))
+(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")
+     (dolist (elem `((file-remote-p
+		      :eval (file-remote-p "/ssh:user@host:/tmp/foo")
+		      :eval (file-remote-p "/ssh:user@host:/tmp/foo" 'method)
+		      :eval (file-remote-p "/ssh:user@[::1]#1234:/tmp/foo" 'host)
+		      ;; We don't want to see the text properties.
+		      :no-eval (file-remote-p "/sudo::/tmp/foo" 'user)
+		      :result ,(substring-no-properties
+			        (file-remote-p "/sudo::/tmp/foo" 'user)))
+		     (file-local-name
+		      :eval (file-local-name "/ssh:user@host:/tmp/foo"))
+		     (file-local-copy
+		      :no-eval (file-local-copy "/ssh:user@host:/tmp/foo")
+		      :eg-result "/tmp/tramp.8ihLbO"
+		      :eval (file-local-copy "/tmp/foo"))))
+       (unless (assoc (car elem)
+		      (member "Remote Files" (assq 'file shortdoc--groups)))
+	 (shortdoc-add-function 'file "Remote Files" elem)))
+
+     (add-hook
+      'tramp-integration-unload-hook
+      (lambda ()
+        (let ((glist (assq 'file shortdoc--groups)))
+	  (while (and (consp glist)
+                      (not (and (stringp (cadr glist))
+                                (string-equal (cadr glist) "Remote Files"))))
+            (setq glist (cdr glist)))
+	  (when (consp glist)
+            (setcdr glist nil))))))))
 
 ;;; Integration of compile.el: