Skip to content

Commit 9162e63

Browse files
committed
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 <cb@256bit.org>
1 parent 70dfc37 commit 9162e63

3 files changed

Lines changed: 7 additions & 1 deletion

File tree

src/optionstr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ static char *(p_briopt_values[]) = {"shift:", "min:", "sbr", "list:", "column:",
3030
#endif
3131
#if defined(FEAT_DIFF)
3232
// Note: Keep this in sync with diffopt_changed()
33-
static char *(p_dip_values[]) = {"filler", "context:", "iblank", "icase", "iwhite", "iwhiteall", "iwhiteeol", "horizontal", "vertical", "closeoff", "hiddenoff", "foldcolumn:", "followwrap", "internal", "indent-heuristic", "algorithm:", NULL};
33+
static char *(p_dip_values[]) = {"filler", "context:", "iblank", "icase", "iwhite", "iwhiteall", "iwhiteeol", "horizontal", "vertical", "closeoff", "hiddenoff", "foldcolumn:", "followwrap", "internal", "indent-heuristic", "algorithm:", "linematch:", NULL};
3434
static char *(p_dip_algorithm_values[]) = {"myers", "minimal", "patience", "histogram", NULL};
3535
#endif
3636
static char *(p_nf_values[]) = {"bin", "octal", "hex", "alpha", "unsigned", "blank", NULL};

src/testdir/test_options.vim

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,10 @@ func Test_set_completion_string_values()
701701
" Test empty option
702702
set diffopt=
703703
call assert_equal([], getcompletion('set diffopt-=', 'cmdline'))
704+
" Test all possible values
705+
call assert_equal(['filler', 'context:', 'iblank', 'icase', 'iwhite', 'iwhiteall', 'iwhiteeol', 'horizontal',
706+
\ 'vertical', 'closeoff', 'hiddenoff', 'foldcolumn:', 'followwrap', 'internal', 'indent-heuristic', 'algorithm:', 'linematch:'],
707+
\ getcompletion('set diffopt=', 'cmdline'))
704708
set diffopt&
705709

706710
" Test escaping output

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
1022,
707709
/**/
708710
1021,
709711
/**/

0 commit comments

Comments
 (0)