1
0
forked from aniani/vim

patch 9.1.0512: Mode message for spell completion doesn't match allowed keys

Problem:  Mode message for spell completion doesn't match allowed keys
          (Kyle Kovacs)
Solution: Show "^S" instead of "s".
          (zeertzjq)

This matches the code in vim_is_ctrl_x_key():

	case CTRL_X_SPELL:
	    return (c == Ctrl_S || c == Ctrl_P || c == Ctrl_N);

fixes: neovim/neovim#29431
closes: #15065

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2024-06-21 07:55:07 +02:00
committed by Christian Brabandt
parent bc6f96708e
commit 7002c055d5
3 changed files with 18 additions and 1 deletions

View File

@@ -58,7 +58,7 @@ static char *ctrl_x_msgs[] =
N_(" Command-line completion (^V^N^P)"),
N_(" User defined completion (^U^N^P)"),
N_(" Omni completion (^O^N^P)"),
N_(" Spelling suggestion (s^N^P)"),
N_(" Spelling suggestion (^S^N^P)"),
N_(" Keyword Local completion (^N^P)"),
NULL, // CTRL_X_EVAL doesn't use msg.
N_(" Command-line completion (^V^N^P)"),

View File

@@ -5,6 +5,7 @@ source check.vim
CheckFeature spell
source screendump.vim
source view_util.vim
func TearDown()
set nospell
@@ -300,6 +301,20 @@ func Test_compl_with_CTRL_X_CTRL_K_using_spell()
set spell& spelllang& dictionary& ignorecase&
endfunc
func Test_compl_with_CTRL_X_s()
new
set spell spelllang=en_us showmode
inoremap <buffer><F2> <Cmd>let g:msg = Screenline(&lines)<CR>
call feedkeys("STheatre\<C-X>s\<F2>\<C-Y>\<Esc>", 'tx')
call assert_equal(['Theater'], getline(1, '$'))
call assert_match('(^S^N^P)', g:msg)
bwipe!
set spell& spelllang& showmode&
unlet g:msg
endfunc
func Test_spellrepall()
new
set spell

View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
512,
/**/
511,
/**/