From 079625d3c618188fc76b89f8d942f0e7004d0312 Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 29 Nov 2022 17:00:02 +0100
Subject: [PATCH] Tramp cleanup

* doc/misc/tramp.texi: Use @value{tramp} where appropriate.

* doc/misc/trampver.texi: Change "Tramp" format ifplaintext.

* lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist):
Ignore `memory-info'.
---
 doc/misc/tramp.texi       | 14 +++++++-------
 doc/misc/trampver.texi    | 10 +++++++---
 lisp/net/tramp-archive.el |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 403c0daa67b..80874049faf 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -1,9 +1,9 @@
 \input texinfo   @c -*- mode: texinfo; coding: utf-8 -*-
-@setfilename ../../info/tramp.info
+@setfilename ../info/tramp
 @c %**start of header
 @include docstyle.texi
-@c In the Tramp GIT, the version number is auto-frobbed from tramp.el,
-@c and the bug report address is auto-frobbed from configure.ac.
+@c In the Tramp GIT, the version number and the bug report address
+@c are auto-frobbed from configure.ac.
 @include trampver.texi
 @settitle @value{tramp} @value{trampver} User Manual
 @c %**end of header
@@ -3659,9 +3659,9 @@ directory:
 @end group
 @end example
 
-Since Tramp cannot know in advance which share directory is intended
-to use, this expansion can be applied only when a share directory has
-been used already.
+Since @value{tramp} cannot know in advance which share directory is
+intended to use, this expansion can be applied only when a share
+directory has been used already.
 
 The methods @option{adb}, @option{rclone} and @option{sshfs} do not
 support home directory expansion at all.  However, @value{tramp} keeps
@@ -4398,7 +4398,7 @@ specifies the target to be applied for renaming buffer file names from
 source via @code{tramp-rename-files}.  @code{source} is a regular
 expressions, which matches a remote file name.  @code{target} must be
 a directory name, which could be remote (including remote directories
-Tramp infers by default, such as @samp{@trampfn{method,user@@host,}}).
+@value{tramp} infers by default, such as @samp{@trampfn{method,user@@host,}}).
 
 @code{target} can contain the patterns @code{%m}, @code{%u} or
 @code{%h}, which are replaced by the method name, user name or host
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 9e1be52cd38..45cc12b2394 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -5,9 +5,8 @@
 @c Copyright (C) 2003--2022 Free Software Foundation, Inc.
 @c See file doclicense.texi for copying conditions.
 
-@c In the Tramp GIT, the version numbers are auto-frobbed from
-@c tramp.el, and the bug report address is auto-frobbed from
-@c configure.ac.
+@c In the  Tramp GIT, the version number and the bug report address
+@c are auto-frobbed from configure.ac.
 @set trampver 2.6.0-pre
 @set trampurl https://www.gnu.org/software/tramp/
 @set tramp-bug-report-address tramp-devel@@gnu.org
@@ -19,7 +18,12 @@
 @set infodir /usr/local/share/info
 
 @c Formatting of the tramp program name consistent.
+@ifplaintext
+@set tramp Tramp
+@end ifplaintext
+@ifnotplaintext
 @set tramp @sc{Tramp}
+@end ifnotplaintext
 
 @c Some flags which define the remote file name syntax.
 @ifclear unified
diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el
index 1a64689c53d..9c1e78d6b0b 100644
--- a/lisp/net/tramp-archive.el
+++ b/lisp/net/tramp-archive.el
@@ -297,7 +297,7 @@ It must be supported by libarchive(3).")
     (make-nearby-temp-file . tramp-handle-make-nearby-temp-file)
     (make-process . ignore)
     (make-symbolic-link . tramp-archive-handle-not-implemented)
-    ;; `memory-info' performed by default handler.
+    (memory-info . ignore)
     (process-attributes . ignore)
     (process-file . ignore)
     (rename-file . tramp-archive-handle-not-implemented)
-- 
2.39.5