diff options
| author | LemonBoy <thatlemon@gmail.com> | 2023-08-15 23:07:55 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-08-15 23:14:30 +0200 |
| commit | e98fb643ec5f84f9088c8b1434a0bd6ff988dc2d (patch) | |
| tree | a1652a573b74a2c75e5c4d623f95cbe047e9f3ab | |
| parent | 636d32b327309f453e5cdfe75bbe7ad14550093a (diff) | |
patch 9.0.1718: dict-completion does not respect regionv9.0.1718
Problem: dict-completion does not respect region
Solution: respect selected region in dict completion
Set do_region to zero as we don't want a complete dump of the matching
words, we want the code to filter them according to the user's selected
region.
closes: #12792
closes: #7025
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: LemonBoy <thatlemon@gmail.com>
| -rw-r--r-- | src/spell.c | 9 | ||||
| -rw-r--r-- | src/testdir/test_spell.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/spell.c b/src/spell.c index ef06ab3e06..1f4c60ed82 100644 --- a/src/spell.c +++ b/src/spell.c @@ -3942,13 +3942,10 @@ spell_dump_compl( } } - if (do_region && region_names != NULL) + if (do_region && region_names != NULL && pat == NULL) { - if (pat == NULL) - { - vim_snprintf((char *)IObuff, IOSIZE, "/regions=%s", region_names); - ml_append(lnum++, IObuff, (colnr_T)0, FALSE); - } + vim_snprintf((char *)IObuff, IOSIZE, "/regions=%s", region_names); + ml_append(lnum++, IObuff, (colnr_T)0, FALSE); } else do_region = FALSE; diff --git a/src/testdir/test_spell.vim b/src/testdir/test_spell.vim index 3f7b028bcb..9eecb1e3f5 100644 --- a/src/testdir/test_spell.vim +++ b/src/testdir/test_spell.vim @@ -274,8 +274,7 @@ func Test_compl_with_CTRL_X_CTRL_K_using_spell() call assert_equal(['theater'], getline(1, '$')) set spelllang=en_gb call feedkeys("Stheat\<c-x>\<c-k>\<esc>", 'tnx') - " FIXME: commented out, expected theatre bug got theater. See issue #7025. - " call assert_equal(['theatre'], getline(1, '$')) + call assert_equal(['theatre'], getline(1, '$')) bwipe! set spell& spelllang& dictionary& ignorecase& diff --git a/src/version.c b/src/version.c index d5d18556a4..a1cda69cb9 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1718, +/**/ 1717, /**/ 1716, |