Skip to content

Commit

Permalink
Apply commit 00adee897ac from Emacs
Browse files Browse the repository at this point in the history
  • Loading branch information
tarsius committed Aug 5, 2024
1 parent 7ff6baa commit 27fbe66
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions docs/transient.org
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ commands even have so many options that they introduce /subcommands/
:UNNUMBERED: notoc
:END:

What about Emacs commands used interactively? How do these handle
What about Emacs commands used interactively? How do these handle
options? One solution is to make many versions of the same command,
so you don't need to! Consider: =delete-other-windows= vs.
so you don't need to! Consider: =delete-other-windows= vs.
=delete-other-windows-vertically= (among many similar examples).

Some Emacs commands will simply prompt you for the next "argument"
Expand Down Expand Up @@ -840,7 +840,7 @@ independently. See [[*Using History]].
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 {{{kbdvar(<KEY>)}}} is
bound to (see [[*Getting Help for Suffix Commands]]), and infixes and
suffixes can be removed from the transient using {{{kbdvar(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]].

Expand Down Expand Up @@ -1088,7 +1088,7 @@ The same form is also used when later binding additional commands
using functions such as ~transient-insert-suffix~, see [[*Modifying
Existing Transients]].

Note that an infix is a special kind of suffix. Depending on context
Note that an infix is a special kind of suffix. Depending on context
“suffixes” means “suffixes (including infixes)” or “non-infix
suffixes”. Here it means the former.

Expand Down Expand Up @@ -1171,7 +1171,7 @@ Slots]].
#+cindex: defining suffix commands
#+cindex: defining infix commands

Note that an infix is a special kind of suffix. Depending on context
Note that an infix is a special kind of suffix. Depending on context
“suffixes” means “suffixes (including infixes)” or “non-infix
suffixes”.

Expand Down Expand Up @@ -1246,7 +1246,7 @@ When returning to the command-loop after calling the suffix command,
the arguments are reset to ~nil~ (which causes the function to return
~nil~ too).

Like for Emacs' prefix arguments, it is advisable, but not mandatory,
Like for Emacs's prefix arguments, it is advisable, but not mandatory,
to access the infix arguments inside the command's ~interactive~ form.
The preferred way of doing that is to call the ~transient-args~
function, which for infix arguments serves about the same purpose as
Expand Down
12 changes: 6 additions & 6 deletions docs/transient.texi
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@ commands even have so many options that they introduce @emph{subcommands}
@anchor{Using Transient for composing interactive commands}
@heading Using Transient for composing interactive commands

What about Emacs commands used interactively? How do these handle
What about Emacs commands used interactively? How do these handle
options? One solution is to make many versions of the same command,
so you don't need to! Consider: @samp{delete-other-windows} vs.
so you don't need to! Consider: @samp{delete-other-windows} vs.
@samp{delete-other-windows-vertically} (among many similar examples).

Some Emacs commands will simply prompt you for the next "argument"
Expand Down Expand Up @@ -1017,7 +1017,7 @@ independently. See @ref{Using History}.
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 @kbd{@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 @var{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}.

Expand Down Expand Up @@ -1280,7 +1280,7 @@ individual suffix command.
The same form is also used when later binding additional commands
using functions such as @code{transient-insert-suffix}, see @ref{Modifying Existing Transients}.

Note that an infix is a special kind of suffix. Depending on context
Note that an infix is a special kind of suffix. Depending on context
``suffixes'' means ``suffixes (including infixes)'' or ``non-infix
suffixes''. Here it means the former.

Expand Down Expand Up @@ -1373,7 +1373,7 @@ argument supported by the constructor of that class. See @ref{Suffix Slots}.
@cindex defining suffix commands
@cindex defining infix commands

Note that an infix is a special kind of suffix. Depending on context
Note that an infix is a special kind of suffix. Depending on context
``suffixes'' means ``suffixes (including infixes)'' or ``non-infix
suffixes''.

Expand Down Expand Up @@ -1449,7 +1449,7 @@ When returning to the command-loop after calling the suffix command,
the arguments are reset to @code{nil} (which causes the function to return
@code{nil} too).

Like for Emacs' prefix arguments, it is advisable, but not mandatory,
Like for Emacs's prefix arguments, it is advisable, but not mandatory,
to access the infix arguments inside the command's @code{interactive} form.
The preferred way of doing that is to call the @code{transient-args}
function, which for infix arguments serves about the same purpose as
Expand Down

0 comments on commit 27fbe66

Please sign in to comment.