patch 9.0.1718: dict-completion does not respect region
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>
diff --git a/src/spell.c b/src/spell.c
index ef06ab3..1f4c60e 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -3942,13 +3942,10 @@
}
}
- 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 3f7b028..9eecb1e 100644
--- a/src/testdir/test_spell.vim
+++ b/src/testdir/test_spell.vim
@@ -274,8 +274,7 @@
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 d5d1855..a1cda69 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1718,
+/**/
1717,
/**/
1716,