patch 9.1.1022: linematch option value not completed
Commit:
https://github.com/vim/vim/commit/9162e636b31dcac57876cbdec15a683cedd9760e
Author: Christian Brabandt <[email protected]>
Date: Thu Jan 16 19:03:40 2025 +0100
patch 9.1.1022: linematch option value not completed
Problem: linematch option value not completed
(after v9.1.1009)
Solution: Update diffoption completion values
related: #9661
closes: #16437
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/optionstr.c b/src/optionstr.c
index 92474336a..86c7967e5 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -30,7 +30,7 @@ static char *(p_briopt_values[]) = {"shift:", "min:", "sbr",
"list:", "column:",
#endif
#if defined(FEAT_DIFF)
// Note: Keep this in sync with diffopt_changed()
-static char *(p_dip_values[]) = {"filler", "context:", "iblank", "icase",
"iwhite", "iwhiteall", "iwhiteeol", "horizontal", "vertical", "closeoff",
"hiddenoff", "foldcolumn:", "followwrap", "internal", "indent-heuristic",
"algorithm:", NULL};
+static char *(p_dip_values[]) = {"filler", "context:", "iblank", "icase",
"iwhite", "iwhiteall", "iwhiteeol", "horizontal", "vertical", "closeoff",
"hiddenoff", "foldcolumn:", "followwrap", "internal", "indent-heuristic",
"algorithm:", "linematch:", NULL};
static char *(p_dip_algorithm_values[]) = {"myers", "minimal", "patience",
"histogram", NULL};
#endif
static char *(p_nf_values[]) = {"bin", "octal", "hex", "alpha", "unsigned",
"blank", NULL};
diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index 24bdc42fe..a7621f5d0 100644
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -701,6 +701,10 @@ func Test_set_completion_string_values()
" Test empty option
set diffopt=
call assert_equal([], getcompletion('set diffopt-=', 'cmdline'))
+ " Test all possible values
+ call assert_equal(['filler', 'context:', 'iblank', 'icase', 'iwhite',
'iwhiteall', 'iwhiteeol', 'horizontal',
+ \ 'vertical', 'closeoff', 'hiddenoff', 'foldcolumn:', 'followwrap',
'internal', 'indent-heuristic', 'algorithm:', 'linematch:'],
+ \ getcompletion('set diffopt=', 'cmdline'))
set diffopt&
" Test escaping output
diff --git a/src/version.c b/src/version.c
index c360a2416..f2d77568f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1022,
/**/
1021,
/**/
--
--
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 visit
https://groups.google.com/d/msgid/vim_dev/E1tYUOX-00GO2R-KX%40256bit.org.
