patch 9.0.1718: dict-completion does not respect region
Commit:
https://github.com/vim/vim/commit/e98fb643ec5f84f9088c8b1434a0bd6ff988dc2d
Author: LemonBoy <[email protected]>
Date: Tue Aug 15 23:07:55 2023 +0200
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 <[email protected]>
Co-authored-by: LemonBoy <[email protected]>
diff --git a/src/spell.c b/src/spell.c
index ef06ab3e0..1f4c60ed8 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 3f7b028bc..9eecb1e3f 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 d5d18556a..a1cda69cb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1718,
/**/
1717,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1qW1Na-003c9p-TN%40256bit.org.
