Merge remote-tracking branch 'upstream/master' into mix_20240309HEADrahm

1 files changed, 24 insertions, 15 deletions

diff --git a/test/old/testdir/gen_opt_test.vim b/test/old/testdir/gen_opt_test.vim
index be5a7e6ee4..f12ce8c7c4 100644
--- a/test/old/testdir/gen_opt_test.vim
+++ b/test/old/testdir/gen_opt_test.vim
@@ -87,7 +87,7 @@ let test_values = {
       \		['xxx', 'help,nofile']],
       \ 'clipboard': [['', 'unnamed'], ['xxx', '\ze*', 'exclude:\\%(']],
       \ 'completeopt': [['', 'menu', 'menuone', 'longest', 'preview', 'popup',
-      \		'noinsert', 'noselect', 'fuzzy', 'menu,longest'],
+      \		'noinsert', 'noselect', 'fuzzy', 'preinsert', 'menu,longest'],
       \		['xxx', 'menu,,,longest,']],
       \ 'encoding': [['utf8'], []],
       \ 'foldcolumn': [[0, 1, 4, 'auto', 'auto:1', 'auto:9'], [-1, 13, 999]],
@@ -117,12 +117,11 @@ let test_values = {
       "\ 'imstyle': [[0, 1], [-1, 2, 999]],
       \ 'lines': [[2, 24, 1000], [-1, 0, 1]],
       \ 'linespace': [[-1, 0, 2, 4, 999], ['']],
-      \ 'msghistory': [[0, 1, 100, 10000], [-1, 10001]],
       \ 'numberwidth': [[1, 4, 8, 10, 11, 20], [-1, 0, 21]],
       \ 'regexpengine': [[0, 1, 2], [-1, 3, 999]],
       \ 'report': [[0, 1, 2, 9999], [-1]],
-      \ 'scroll': [[0, 1, 2, 20], [-1, 999]],
-      \ 'scrolljump': [[-100, -1, 0, 1, 2, 20], [-101, 999]],
+      \ 'scroll': [[0, 1, 2, 15], [-1, 999]],
+      \ 'scrolljump': [[-100, -1, 0, 1, 2, 15], [-101, 999]],
       \ 'scrolloff': [[0, 1, 8, 999], [-1]],
       \ 'shiftwidth': [[0, 1, 8, 999], [-1]],
       \ 'sidescroll': [[0, 1, 8, 999], [-1]],
@@ -146,8 +145,8 @@ let test_values = {
       \ 'winwidth': [[1, 10, 999], [-1, 0]],
       \
       "\ string options
-      \ 'ambiwidth': [['', 'single', 'double'], ['xxx']],
-      \ 'background': [['', 'light', 'dark'], ['xxx']],
+      \ 'ambiwidth': [['single', 'double'], ['xxx']],
+      \ 'background': [['light', 'dark'], ['xxx']],
       "\ 'backspace': [[0, 1, 2, 3, '', 'indent', 'eol', 'start', 'nostop',
       "\ "		'eol,start', 'indent,eol,nostop'],
       "\ "		[-1, 4, 'xxx']],
@@ -187,7 +186,7 @@ let test_values = {
       \		['xxx']],
       \ 'concealcursor': [['', 'n', 'v', 'i', 'c', 'nvic'], ['xxx']],
       "\ 'completeopt': [['', 'menu', 'menuone', 'longest', 'preview', 'popup',
-      "\ "		'popuphidden', 'noinsert', 'noselect', 'fuzzy', 'menu,longest'],
+      "\ "		'popuphidden', 'noinsert', 'noselect', 'fuzzy', 'preinsert', 'menu,longest'],
       "\ "		['xxx', 'menu,,,longest,']],
       \ 'completeitemalign': [['abbr,kind,menu', 'menu,abbr,kind'],
       \		['', 'xxx', 'abbr', 'abbr,menu', 'abbr,menu,kind,abbr',
@@ -210,17 +209,19 @@ let test_values = {
       \		'icase', 'iwhite', 'iwhiteall', 'horizontal', 'vertical',
       \		'closeoff', 'hiddenoff', 'foldcolumn:0', 'foldcolumn:12',
       \		'followwrap', 'internal', 'indent-heuristic', 'algorithm:myers',
-      \		'algorithm:minimal', 'algorithm:patience',
-      \		'algorithm:histogram', 'icase,iwhite'],
-      \		['xxx', 'foldcolumn:xxx', 'algorithm:xxx', 'algorithm:']],
+      \		'icase,iwhite', 'algorithm:minimal', 'algorithm:patience',
+      \		'algorithm:histogram', 'linematch:5'],
+      \		['xxx', 'foldcolumn:', 'foldcolumn:x', 'foldcolumn:xxx',
+      \		'linematch:', 'linematch:x', 'linematch:xxx', 'algorithm:',
+      \		'algorithm:xxx', 'context:', 'context:x', 'context:xxx']],
       \ 'display': [['', 'lastline', 'truncate', 'uhex', 'lastline,uhex'],
       \		['xxx']],
-      \ 'eadirection': [['', 'both', 'ver', 'hor'], ['xxx', 'ver,hor']],
+      \ 'eadirection': [['both', 'ver', 'hor'], ['xxx', 'ver,hor']],
       "\ 'encoding': [['latin1'], ['xxx', '']],
       \ 'eventignore': [['', 'WinEnter', 'WinLeave,winenter', 'all,WinEnter'],
       \		['xxx']],
       \ 'fileencoding': [['', 'latin1', 'xxx'], []],
-      \ 'fileformat': [['', 'dos', 'unix', 'mac'], ['xxx']],
+      \ 'fileformat': [['dos', 'unix', 'mac'], ['xxx']],
       \ 'fileformats': [['', 'dos', 'dos,unix'], ['xxx']],
       \ 'fillchars': [['', 'stl:x', 'stlnc:x', 'vert:x', 'fold:x', 'foldopen:x',
       \		'foldclose:x', 'foldsep:x', 'diff:x', 'eob:x', 'lastline:x',
@@ -264,10 +265,18 @@ let test_values = {
       \		'eol:\\u21b5', 'eol:\\U000021b5', 'eol:x,space:y'],
       \		['xxx', 'eol:']],
       \ 'matchpairs': [['', '(:)', '(:),<:>'], ['xxx']],
+      \ 'messagesopt': [['hit-enter,history:1', 'hit-enter,history:10000',
+      \		'history:100,wait:100', 'history:0,wait:0',
+      \		'hit-enter,history:1,wait:1'],
+      \		['xxx', 'history:500', 'hit-enter,history:-1',
+      \		'hit-enter,history:10001', 'history:0,wait:10001',
+      \		'hit-enter', 'history:10,wait:99999999999999999999',
+      \		'history:99999999999999999999,wait:10', 'wait:10',
+      \		'history:-10', 'history:10,wait:-10']],
       \ 'mkspellmem': [['10000,100,12'], ['', 'xxx', '10000,100']],
       \ 'mouse': [['', 'n', 'v', 'i', 'c', 'h', 'a', 'r', 'nvi'],
       \		['xxx', 'n,v,i']],
-      \ 'mousemodel': [['', 'extend', 'popup', 'popup_setpos'], ['xxx']],
+      \ 'mousemodel': [['extend', 'popup', 'popup_setpos'], ['xxx']],
       \ 'mouseshape': [['', 'n:arrow'], ['xxx']],
       \ 'nrformats': [['', 'alpha', 'octal', 'hex', 'bin', 'unsigned', 'blank',
       \		'alpha,hex,bin'],
@@ -292,7 +301,7 @@ let test_values = {
       \ 'sessionoptions': [['', 'blank', 'curdir', 'sesdir',
       \		'help,options,slash'],
       \		['xxx', 'curdir,sesdir']],
-      \ 'showcmdloc': [['', 'last', 'statusline', 'tabline'], ['xxx']],
+      \ 'showcmdloc': [['last', 'statusline', 'tabline'], ['xxx']],
       "\ 'signcolumn': [['', 'auto', 'no', 'yes', 'number'], ['xxx', 'no,yes']],
       \ 'spellfile': [['', 'file.en.add', 'xxx.en.add,yyy.gb.add,zzz.ja.add',
       \		'/tmp/dir\ with\ space/en.utf-8.add',
@@ -304,7 +313,7 @@ let test_values = {
       \ 'spellsuggest': [['', 'best', 'double', 'fast', '100', 'timeout:100',
       \		'timeout:-1', 'file:/tmp/file', 'expr:Func()', 'double,33'],
       \		['xxx', '-1', 'timeout:', 'best,double', 'double,fast']],
-      \ 'splitkeep': [['', 'cursor', 'screen', 'topline'], ['xxx']],
+      \ 'splitkeep': [['cursor', 'screen', 'topline'], ['xxx']],
       \ 'statusline': [['', 'xxx'], ['%$', '%{', '%{%', '%{%}', '%(', '%)']],
       "\ 'swapsync': [['', 'sync', 'fsync'], ['xxx']],
       \ 'switchbuf': [['', 'useopen', 'usetab', 'split', 'vsplit', 'newtab',