mirrors
/
zsh
mirror of git://git.code.sf.net/p/zsh/code
1
0
Fork 0
Code Releases Activity

52496 + 52377: clarify SPROMPT behavior when CORRECT_ALL is set

This commit is contained in:
Bart Schaefer 2024-01-24 18:06:44 -08:00
parent 1f861ceba1
commit 2a538491eb
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2024-01-24 Bart Schaefer <schaefer@zsh.org> 2024-01-24 Bart Schaefer <schaefer@zsh.org>
* 52496 + 52377: Doc/Zsh/options.yo, Doc/Zsh/params.yo: clarify
SPROMPT behavior when CORRECT_ALL is set
* 52492: Src/math.c: prevent indexing error when using recursive * 52492: Src/math.c: prevent indexing error when using recursive
arithmetic in array subscript (operator stops on operand error) arithmetic in array subscript (operator stops on operand error)

8
Doc/Zsh/options.yo
View File

@ -1214,6 +1214,9 @@ Note that, when the tt(HASH_LIST_ALL) option is not set or when some
directories in the path are not readable, this may falsely report spelling directories in the path are not readable, this may falsely report spelling
errors the first time some commands are used. errors the first time some commands are used.
Refer to the shell variable tt(SPROMPT) for an explanation of the
`tt([nyae])' (no/yes/abort/edit) prompt that is offered.
The shell variable tt(CORRECT_IGNORE) may be set to a pattern to The shell variable tt(CORRECT_IGNORE) may be set to a pattern to
match words that will never be offered as corrections. match words that will never be offered as corrections.
) )
@ -1222,7 +1225,10 @@ pindex(NO_CORRECT_ALL)
pindex(CORRECTALL) pindex(CORRECTALL)
pindex(NOCORRECTALL) pindex(NOCORRECTALL)
item(tt(CORRECT_ALL) (tt(-O)))( item(tt(CORRECT_ALL) (tt(-O)))(
Try to correct the spelling of all arguments in a line. Try to correct the spelling of all arguments in a line, in order from
left to right, treating each as a file name. Answering `tt(a)' or
`tt(e)' at any prompt stops all corrections, otherwise every correction
is prompted for.
The shell variable tt(CORRECT_IGNORE_FILE) may be set to a pattern to The shell variable tt(CORRECT_IGNORE_FILE) may be set to a pattern to
match file names that will never be offered as corrections. match file names that will never be offered as corrections.

10
Doc/Zsh/params.yo
View File

@ -1635,9 +1635,13 @@ All other prompt escapes are also allowed.
The actions available at the prompt are tt([nyae]): The actions available at the prompt are tt([nyae]):
startsitem() startsitem()
sitem(tt(n) +LPAR()`no'+RPAR() +LPAR()default+RPAR())(Discard the correction and run the command.) sitem(tt(n) +LPAR()`no'+RPAR() +LPAR()default+RPAR())(Discard the correction.
sitem(tt(y) +LPAR()`yes'+RPAR())(Make the correction and run the command.) If there are no more corrections, accept the command line, else (with
sitem(tt(a) +LPAR()`abort'+RPAR())(Discard the entire command line without running it.) tt(CORRECT_ALL)) prompt for the next.)
sitem(tt(y) +LPAR()`yes'+RPAR())(Make the correction. If there are no more
corrections, accept the command line.)
sitem(tt(a) +LPAR()`abort'+RPAR())(Place the entire command line in the
history for later edit, but without accepting it.)
sitem(tt(e) +LPAR()`edit'+RPAR())(Resume editing the command line.) sitem(tt(e) +LPAR()`edit'+RPAR())(Resume editing the command line.)
endsitem() endsitem()
) )