From 2af6b3147dc0116e481229951d34487f6a9a0748 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 1 Oct 2020 14:23:20 +0200 Subject: [PATCH] Clarification in Tramp manual * doc/misc/tramp.texi: Harmonize "Git" spelling. (Frequently Asked Questions): Describe Emacs version mismatch. --- doc/misc/tramp.texi | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index fd3415d1ca0..27390983343 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -383,7 +383,7 @@ After one of the above commands, @file{~/emacs/tramp} will containing the latest version of @value{tramp}. @noindent -To fetch updates from the repository, use git pull: +To fetch updates from the repository, use @code{git pull}: @example @group @@ -1687,9 +1687,9 @@ Integration for LXD containers. A container is accessed via @item magit-tramp @cindex method @option{git} @cindex @option{git} method -Browsing git repositories with @code{magit}. A versioned file is +Browsing Git repositories with @code{magit}. A versioned file is accessed via @file{@trampfn{git,rev@@root-dir,/path/to/file}}. -@samp{rev} is a git revision, and @samp{root-dir} is a virtual host +@samp{rev} is a Git revision, and @samp{root-dir} is a virtual host name for the root directory, specified in @code{magit-tramp-hosts-alist}. @@ -4646,6 +4646,18 @@ path, or somewhere else entirely (including locally). @pxref{Renaming remote files}. +@item +I get a warning @samp{Tramp has been compiled with Emacs a.b, this is Emacs c.d} + +@value{tramp} comes with compatibility code for different Emacs +versions. When you see this warning, you don't use the Emacs built-in +version of @value{tramp}. In case you have installed @value{tramp} +from GNU ELPA, you must delete and reinstall it. +@ifset installchapter +In case you have installed it from its Git repository, @ref{Recompilation}. +@end ifset + + @item How to disable other packages from calling @value{tramp}? -- 2.39.5