From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 1 Nov 2021 11:32:06 +0000 (+0100)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~3671^2~306
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8b861b07cf9d41da15f751b996d88d7079653508;p=emacs.git

Merge from origin/emacs-28

ba4daf2214 Adapt arguments of `tramp-make-tramp-file-name'
a34466731b Fix typo in describe-map-tree doc string
---

8b861b07cf9d41da15f751b996d88d7079653508
diff --cc lisp/help.el
index d12f388c45f,21c8255c690..19cd773f423
--- a/lisp/help.el
+++ b/lisp/help.el
@@@ -1250,12 -1233,15 +1250,12 @@@ If NOMENU is non-nil, then omit menu-ba
  If TRANSL is non-nil, the definitions are actually key
  translations so print strings and vectors differently.
  
- If ALWAYS_TITLE is non-nil, print the title even if there are no
+ If ALWAYS-TITLE is non-nil, print the title even if there are no
  maps to look through.
  
- If MENTION_SHADOW is non-nil, then when something is shadowed by
+ If MENTION-SHADOW is non-nil, then when something is shadowed by
  SHADOW, don't omit it; instead, mention it but say it is
 -shadowed.
 -
 -Any inserted text ends in two newlines (used by
 -`help-make-xrefs')."
 +shadowed."
    (let* ((amaps (accessible-keymaps startmap prefix))
           (orig-maps (if no-menu
                          (progn