branch: externals/transient commit 86b24ebd762fa0fdde8a39c443dcb19e56464882 Author: Jonas Bernoulli <jo...@bernoul.li> Commit: Jonas Bernoulli <jo...@bernoul.li>
manual: Use new "kbdvar" macro --- docs/.orgconfig | 1 + docs/transient.org | 6 +++--- docs/transient.texi | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/.orgconfig b/docs/.orgconfig index df2c1b9b36..acfbd0fdcf 100644 --- a/docs/.orgconfig +++ b/docs/.orgconfig @@ -8,5 +8,6 @@ #+macro: version (eval (or (getenv "PACKAGE_REVDESC") (getenv "PACKAGE_VERSION") (ignore-errors (car (process-lines "git" "describe" "--exact"))) (ignore-errors (concat (car (process-lines "git" "describe" (if (getenv "AMEND") "HEAD~" "HEAD"))) "+1")))) #+macro: var @@texinfo:@var{@@$1@@texinfo:}@@ +#+macro: kbdvar (eval (format "@@texinfo:@kbd{@@%s@@texinfo:}@@" (let (case-fold-search) (replace-regexp-in-string "<\\([a-zA-Z-]+\\)>" "@@texinfo:@var{@@\\1@@texinfo:}@@" (replace-regexp-in-string org-texinfo--quoted-keys-regexp "@@texinfo:@key{@@\\&@@texinfo:}@@" $1 t) t)))) #+language: en diff --git a/docs/transient.org b/docs/transient.org index 441dda30ec..d23b8e1d33 100644 --- a/docs/transient.org +++ b/docs/transient.org @@ -154,10 +154,10 @@ arguments, and previously it was invoked using those other arguments"), but also remembers the values of individual arguments independently. See [[*Using History]]. -After a transient prefix command is invoked, {{{kbd(C-h <key>)}}} can be used to +After a transient prefix command is invoked, {{{kbdvar(C-h <KEY>)}}} can be used to show the documentation for the infix or suffix command that {{{var(KEY)}}} is bound to (see [[*Getting Help for Suffix Commands]]) and infixes and -suffixes can be removed from the transient using {{{kbd(C-x l <key>)}}}. Infixes +suffixes can be removed from the transient using {{{kbdvar(C-x l <KEY>)}}}. Infixes and suffixes that are disabled by default can be enabled the same way. See [[*Enabling and Disabling Suffixes]]. @@ -258,7 +258,7 @@ A few shared suffix commands are available in all transients. These suffix commands are not shown in the popup buffer by default. This includes the aborting commands mentioned in the previous section, -as well as some other commands that are all bound to {{{kbd(C-x <key>)}}}. After +as well as some other commands that are all bound to {{{kbdvar(C-x <KEY>)}}}. After {{{kbd(C-x)}}} is pressed, a section featuring all these common commands is temporarily shown in the popup buffer. After invoking one of them, the section disappears again. Note however that one of these commands diff --git a/docs/transient.texi b/docs/transient.texi index 865b032c5e..34589c92f6 100644 --- a/docs/transient.texi +++ b/docs/transient.texi @@ -259,10 +259,10 @@ arguments, and previously it was invoked using those other arguments"), but also remembers the values of individual arguments independently. See @ref{Using History}. -After a transient prefix command is invoked, @kbd{C-h <key>} can be used to +After a transient prefix command is invoked, @kbd{C-h @var{KEY}} can be used to show the documentation for the infix or suffix command that @var{KEY} is bound to (see @ref{Getting Help for Suffix Commands}) and infixes and -suffixes can be removed from the transient using @kbd{C-x l <key>}. Infixes +suffixes can be removed from the transient using @kbd{C-x l @var{KEY}}. Infixes and suffixes that are disabled by default can be enabled the same way. See @ref{Enabling and Disabling Suffixes}. @@ -391,7 +391,7 @@ A few shared suffix commands are available in all transients. These suffix commands are not shown in the popup buffer by default. This includes the aborting commands mentioned in the previous section, -as well as some other commands that are all bound to @kbd{C-x <key>}. After +as well as some other commands that are all bound to @kbd{C-x @var{KEY}}. After @kbd{C-x} is pressed, a section featuring all these common commands is temporarily shown in the popup buffer. After invoking one of them, the section disappears again. Note however that one of these commands