Merge remote-tracking branch 'Delapouite/collapse-jumps'

This commit is contained in:
Maxime Coste 2017-10-07 21:52:09 +08:00
commit b93fd8cbca
2 changed files with 10 additions and 5 deletions

View File

@ -1191,16 +1191,18 @@ Some parameters provide a way to change the context of execution:
modifications to the selections or input state will not affect modifications to the selections or input state will not affect
the client. This permits to make some modification to the buffer the client. This permits to make some modification to the buffer
without modifying the user's selection. without modifying the user's selection.
* `-itersel` (requires `-draft`): execute once per selection, in a * `-itersel`: execute once per selection, in a context with only
context with only the considered selection. This permits avoiding the considered selection. This permits avoiding cases where
cases where the selections may get merged. the selections may get merged.
* `-buffer <names>`: execute in the context of each buffers in the * `-buffer <names>`: execute in the context of each buffers in the
comma separated list <names>, '*' as a name can be used to iterate comma separated list <names>, '*' as a name can be used to iterate
on all buffers. on all buffers.
* `-no-hooks`: disable hook execution while executing the keys/commands * `-no-hooks`: disable hook execution while executing the keys/commands
* `-with-maps`: use user key mapping in `:exec` instead of built in keys. * `-with-maps`: use user key mapping in `:exec` instead of built in keys.
* `-save-regs <regs>`: regs is a string of registers to be restored after * `-save-regs <regs>`: regs is a string of registers to be restored after
execution (overwrites the list of registers saved by default) execution (overwrites the list of registers saved by default)
* `-collapse-jumps`:
collapse all jumps into a single one from initial selection
The execution stops when the last key/command is reached, or an error The execution stops when the last key/command is reached, or an error
is raised. is raised.

View File

@ -38,7 +38,7 @@ Optional flags
permits to make some modification to the buffer without modifying permits to make some modification to the buffer without modifying
the users selection the users selection
*-itersel* (requires -draft):: *-itersel*::
execute once per selection, in a context with only the considered execute once per selection, in a context with only the considered
selection. This permits avoiding cases where the selections may selection. This permits avoiding cases where the selections may
get merged get merged
@ -56,3 +56,6 @@ Optional flags
*-save-regs* <regs>:: *-save-regs* <regs>::
regs is a string of registers to be restored after execution (overwrites regs is a string of registers to be restored after execution (overwrites
the list of registers saved by default, c.f. description) the list of registers saved by default, c.f. description)
*-collapse-jumps*::
collapse all jumps into a single one from initial selection