summaryrefslogtreecommitdiff
path: root/uvim/src/testdir
diff options
context:
space:
mode:
authorMehmet Samet Duman <yongdohyun@projecttick.org>2026-04-04 00:19:59 +0300
committerMehmet Samet Duman <yongdohyun@projecttick.org>2026-04-04 00:23:14 +0300
commit5b578e70c314723a3cde5c9bfc2be0bf1dadc93b (patch)
tree768f6a130e7d72ac6741e147bb51c4495bc7a9a9 /uvim/src/testdir
parent2eae5db069dc171f74cd863487655f6a88e5384d (diff)
downloadProject-Tick-5b578e70c314723a3cde5c9bfc2be0bf1dadc93b.tar.gz
Project-Tick-5b578e70c314723a3cde5c9bfc2be0bf1dadc93b.zip
NOISSUE MNV - MNV's not Vim 10.0 is here!
this patch makes bump 9.2 to 10.0 for version number added Project Tick rationale in mnv and made new intro message! This patch completes rebranding Signed-off-by: Mehmet Samet Duman <yongdohyun@projecttick.org>
Diffstat (limited to 'uvim/src/testdir')
-rw-r--r--uvim/src/testdir/samples/Test_tohtml_basic.c.html2
-rw-r--r--uvim/src/testdir/samples/Test_tohtml_basic_no_css.c.html2
-rw-r--r--uvim/src/testdir/test_diffmode.mnv93
-rw-r--r--uvim/src/testdir/test_ex_mode.mnv9
-rw-r--r--uvim/src/testdir/test_expr.mnv4
-rw-r--r--uvim/src/testdir/test_fold.mnv3
-rw-r--r--uvim/src/testdir/test_increment_dbcs.mnv8
-rw-r--r--uvim/src/testdir/test_put.mnv16
-rw-r--r--uvim/src/testdir/test_regex_char_classes.mnv110
-rw-r--r--uvim/src/testdir/test_regexp_utf8.mnv4
10 files changed, 120 insertions, 131 deletions
diff --git a/uvim/src/testdir/samples/Test_tohtml_basic.c.html b/uvim/src/testdir/samples/Test_tohtml_basic.c.html
index c33df84bcc..4f06518240 100644
--- a/uvim/src/testdir/samples/Test_tohtml_basic.c.html
+++ b/uvim/src/testdir/samples/Test_tohtml_basic.c.html
@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>/home/jiangyinzuo/mnv/src/testdir/Test_tohtml_basic.c.html</title>
-<meta name="Generator" content="MNV/9.2">
+<meta name="Generator" content="MNV/10.0">
<meta name="plugin-version" content="mnv9.0_v2">
<meta name="syntax" content="none">
<meta name="settings" content="use_css,no_foldcolumn,pre_wrap,prevent_copy=,use_input_for_pc=none">
diff --git a/uvim/src/testdir/samples/Test_tohtml_basic_no_css.c.html b/uvim/src/testdir/samples/Test_tohtml_basic_no_css.c.html
index acbd337c10..75af36e313 100644
--- a/uvim/src/testdir/samples/Test_tohtml_basic_no_css.c.html
+++ b/uvim/src/testdir/samples/Test_tohtml_basic_no_css.c.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>/home/jiangyinzuo/mnv/src/testdir/Test_tohtml_basic_no_css.c.html</title>
-<meta name="Generator" content="MNV/9.2">
+<meta name="Generator" content="MNV/10.0">
<meta name="plugin-version" content="mnv9.0_v2">
<meta name="syntax" content="none">
<meta name="settings" content="no_pre,no_foldcolumn,expand_tabs,prevent_copy=,use_input_for_pc=none">
diff --git a/uvim/src/testdir/test_diffmode.mnv b/uvim/src/testdir/test_diffmode.mnv
index ffed3c0cb5..72366e6928 100644
--- a/uvim/src/testdir/test_diffmode.mnv
+++ b/uvim/src/testdir/test_diffmode.mnv
@@ -1871,10 +1871,7 @@ endfunc
func Test_diff_manipulations()
set diff
split 0
- sil! norm R
-doobdeuR
-doobdeuR
-doobdeu
+ sil! norm R doobdeuR doobdeuR doobdeu
set nodiff
%bwipe!
@@ -2123,9 +2120,9 @@ func Test_diffexpr_with_diff_func()
END
call writefile(lines, 'XsetupDiffFunc.mnv', 'D')
- call writefilMNV'zero', 'one', 'two', 'three'], 'Xdifffunc1.txt', 'D')
+ call writefile(['zero', 'one', 'two', 'three'], 'Xdifffunc1.txt', 'D')
call writefile(['one', 'twox', 'three', 'four'], 'Xdifffunc2.txt', 'D')
-MNV
+
let buf = RunMNVInTerminal('-S XsetupDiffFunc.mnv', {'rows': 12})
call VerifyScreenDump(buf, 'Test_difffunc_diffexpr_1', {})
call StopMNVInTerminal(buf)
@@ -2232,7 +2229,7 @@ func Test_diff_overlapped_diff_blocks_will_be_merged()
endif
endfunc
END
- call writefilMNVines, 'XdiffSetup', 'D')
+ call writefile(lines, 'XdiffSetup', 'D')
call WriteDiffFiles(0, [], [])
let buf = RunMNVInTerminal('-d -S XdiffSetup Xdifile1 Xdifile2', {})
@@ -2259,11 +2256,11 @@ func Test_diff_overlapped_diff_blocks_will_be_merged()
call writefile(["x", "x", "c"], "Xdinew1")
call writefile(["1c1", "1a2"], "Xdiout1")
call term_sendkeys(buf, ":set diffexpr=DiffExprStub()\<CR>:")
- call VeriMNVoth(buf, "Test_diff_overlapped_2.03", "")
+ call VerifyBoth(buf, "Test_diff_overlapped_2.03", "")
call term_sendkeys(buf, ":set diffexpr&\<CR>:")
call StopMNVInTerminal(buf)
- wincmd cMNV
+ wincmd c
call WriteDiffFiles3(0, [], [], [])
let buf = RunMNVInTerminal('-d -S XdiffSetup Xdifile1 Xdifile2 Xdifile3', {})
@@ -2439,7 +2436,7 @@ func Test_diff_overlapped_diff_blocks_will_be_merged()
" File 3 has 2 overlaps. An add and another add. First overlap's expansion hits
" the 2nd one. Make sure we adjust the diff block to have more lines.
- call WritMNVffFiles3(buf, ["foo", "a", "b", "c", "d", "bar"], ["foo", "w", "x", "y", "z", "u", "bar"], ["foo", "1", "a", "b", "3", "4", "d", "bar"])
+ call WriteDiffFiles3(buf, ["foo", "a", "b", "c", "d", "bar"], ["foo", "w", "x", "y", "z", "u", "bar"], ["foo", "1", "a", "b", "3", "4", "d", "bar"])
call VerifyBoth(buf, "Test_diff_overlapped_3.44", "")
call StopMNVInTerminal(buf)
@@ -2455,7 +2452,7 @@ func Test_diff_topline_noscroll()
call setline(1, range(1,10) + range(50,60))
windo diffthis
norm! G
- exe "norm! MNV<C-y>"
+ exe "norm! 30\<C-y>"
END
call writefile(content, 'Xcontent', 'D')
let buf = RunMNVInTerminal('-S Xcontent', {'rows': 20})
@@ -2466,7 +2463,7 @@ func Test_diff_topline_noscroll()
call term_sendkeys(buf, "\<C-W>p")
call term_wait(buf)
call VerifyScreenDump(buf, 'Test_diff_topline_3', {})
- call termMNVndkeys(buf, "\<C-W>p")
+ call term_sendkeys(buf, "\<C-W>p")
call term_wait(buf)
call VerifyScreenDump(buf, 'Test_diff_topline_4', {})
call StopMNVInTerminal(buf)
@@ -2474,7 +2471,7 @@ endfunc
" Test inline highlighting which shows what's different within each diff block
func Test_diff_inline()
- CheckScreenduMNV
+ CheckScreendump
call WriteDiffFiles(0, [], [])
let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2', {})
@@ -2589,14 +2586,14 @@ func Test_diff_inline()
call VerifyInternal(buf, "Test_diff_inline_multiline_07", " diffopt+=inline:char")
call VerifyInternal(buf, "Test_diff_inline_multiline_08", " diffopt+=inline:char,iwhite")
call VerifyInternal(buf, "Test_diff_inline_multiline_09", " diffopt+=inline:char,iwhiteeol")
- call VeriMNVnternal(buf, "Test_diff_inline_multiline_10", " diffopt+=inline:char,iwhiteall")
+ call VerifyInternal(buf, "Test_diff_inline_multiline_10", " diffopt+=inline:char,iwhiteall")
call term_sendkeys(buf, ":windo set nolist\<CR>")
call StopMNVInTerminal(buf)
endfunc
func Test_diff_inline_multibuffer()
- CheckScreenduMNV
+ CheckScreendump
call WriteDiffFiles3(0, [], [], [])
let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2 Xdifile3', {})
@@ -2643,7 +2640,7 @@ func Test_diff_inline_multibuffer()
call VerifyInternal(buf, "Test_diff_inline_multibuffer_06", " diffopt+=inline:char")
call term_sendkeys(buf, ":diffoff\<CR>")
call VerifyInternal(buf, "Test_diff_inline_multibuffer_07", " diffopt+=inline:char")
- call termMNVndkeys(buf, ":diffthis\<CR>")
+ call term_sendkeys(buf, ":diffthis\<CR>")
call VerifyInternal(buf, "Test_diff_inline_multibuffer_06", " diffopt+=inline:char")
call StopMNVInTerminal(buf)
@@ -2656,10 +2653,10 @@ func Test_diff_inline_multibuffer_empty_block()
call writefile(['anchor1', '1234567890abcde', 'anchor2'], 'Xdifile1')
call writefile(['anchor1', '1234567--0abc-e', 'anchor2'], 'Xdifile2')
- call writefilMNV'anchor1', 'anchor2'], 'Xdifile3')
+ call writefile(['anchor1', 'anchor2'], 'Xdifile3')
call writefile(['anchor1', '1???????90abcd?', 'anchor2'], 'Xdifile4')
- let buf =MNVnMNVInTerminal('-d Xdifile1 Xdifile2 Xdifile3 Xdifile4', {})
+ let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2 Xdifile3 Xdifile4', {})
call VerifyInternal(buf, "Test_diff_inline_multibuffer_empty_block_01", " diffopt+=inline:char")
call StopMNVInTerminal(buf)
@@ -2667,7 +2664,7 @@ endfunc
func Test_diffget_diffput_linematch()
CheckScreendump
- call delete('MNVifile1.swp')
+ call delete('.Xdifile1.swp')
call delete('.Xdifile2.swp')
call WriteDiffFiles(0, [], [])
let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2', {})
@@ -2866,7 +2863,7 @@ func Test_diffget_diffput_linematch()
" put from window 2 using dp line 17
call term_sendkeys(buf, "2\<c-w>w")
call term_sendkeys(buf, "17gg")
- call termMNVndkeys(buf, ":diffput\<CR>")
+ call term_sendkeys(buf, ":diffput\<CR>")
call VerifyScreenDump(buf, 'Test_diff_get_put_linematch_19', {})
" clean up
call StopMNVInTerminal(buf)
@@ -2874,7 +2871,7 @@ endfunc
func Test_linematch_diff()
CheckScreendump
- call delete('MNVifile1.swp')
+ call delete('.Xdifile1.swp')
call delete('.Xdifile2.swp')
call WriteDiffFiles(0, [], [])
let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2', {})
@@ -2894,7 +2891,7 @@ func Test_linematch_diff()
" test that filler is always implicitly set by linematch
call term_sendkeys(buf, ":set diffopt-=filler\<CR>")
call term_sendkeys(buf, ":\<CR>") " clear cmdline
- call VeriMNVcreenDump(buf, 'Test_linematch_diff1', {})
+ call VerifyScreenDump(buf, 'Test_linematch_diff1', {})
" clean up
call StopMNVInTerminal(buf)
@@ -2902,7 +2899,7 @@ endfunc
func Test_linematch_diff_iwhite()
CheckScreendump
- call delete('MNVifile1.swp')
+ call delete('.Xdifile1.swp')
call delete('.Xdifile2.swp')
call WriteDiffFiles(0, [], [])
let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2', {})
@@ -2921,7 +2918,7 @@ func Test_linematch_diff_iwhite()
\ ' // }',
\ '}'])
call VerifyScreenDump(buf, 'Test_linematch_diff_iwhite1', {})
- call termMNVndkeys(buf, ":set diffopt+=iwhiteall\<CR>")
+ call term_sendkeys(buf, ":set diffopt+=iwhiteall\<CR>")
call VerifyScreenDump(buf, 'Test_linematch_diff_iwhite2', {})
" clean up
call StopMNVInTerminal(buf)
@@ -2929,7 +2926,7 @@ endfunc
func Test_linematch_diff_grouping()
CheckScreendump
- call delete('MNVifile1.swp')
+ call delete('.Xdifile1.swp')
call delete('.Xdifile2.swp')
call WriteDiffFiles(0, [], [])
let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2', {})
@@ -2959,7 +2956,7 @@ func Test_linematch_diff_grouping()
\ '?A',
\ '?B',
\ '?C',
- \ '?CMNV
+ \ '?C'])
call VerifyScreenDump(buf, 'Test_linematch_diff_grouping2', {})
" clean up
call StopMNVInTerminal(buf)
@@ -2967,7 +2964,7 @@ endfunc
func Test_linematch_diff_scroll()
CheckScreendump
- call delete('MNVifile1.swp')
+ call delete('.Xdifile1.swp')
call delete('.Xdifile2.swp')
call WriteDiffFiles(0, [], [])
let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2', {})
@@ -2991,7 +2988,7 @@ func Test_linematch_diff_scroll()
call VerifyScreenDump(buf, 'Test_linematch_diff_grouping_scroll0', {})
call term_sendkeys(buf, "3\<c-e>")
call VerifyScreenDump(buf, 'Test_linematch_diff_grouping_scroll1', {})
- call termMNVndkeys(buf, "3\<c-e>")
+ call term_sendkeys(buf, "3\<c-e>")
call VerifyScreenDump(buf, 'Test_linematch_diff_grouping_scroll2', {})
" clean up
call StopMNVInTerminal(buf)
@@ -2999,7 +2996,7 @@ endfunc
func Test_linematch_line_limit_exceeded()
CheckScreendump
- call delete('MNVifile1.swp')
+ call delete('.Xdifile1.swp')
call delete('.Xdifile2.swp')
call WriteDiffFiles(0, [], [])
let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2', {})
@@ -3041,7 +3038,7 @@ func Test_linematch_line_limit_exceeded()
call VerifyScreenDump(buf, 'Test_linematch_line_limit_exceeded1', {})
" after increasing the count to 30, the limit is not exceeded, and the
" alignment algorithm will run on the largest diff block here
- call termMNVndkeys(buf, ":set diffopt+=linematch:30\<CR>")
+ call term_sendkeys(buf, ":set diffopt+=linematch:30\<CR>")
call VerifyScreenDump(buf, 'Test_linematch_line_limit_exceeded2', {})
" clean up
call StopMNVInTerminal(buf)
@@ -3050,7 +3047,7 @@ endfunc
func Test_linematch_3diffs()
CheckScreendump
call delete('.Xdifile1.swp')
- call delete('MNVifile2.swp')
+ call delete('.Xdifile2.swp')
call delete('.Xdifile3.swp')
call WriteDiffFiles3(0, [], [], [])
let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2 Xdifile3', {})
@@ -3079,7 +3076,7 @@ func Test_linematch_3diffs()
\ " common line",
\ " BBB",
\ " BBB",
- \ "MNV BBB"])
+ \ " BBB"])
call VerifyScreenDump(buf, 'Test_linematch_3diffs1', {})
" clean up
call StopMNVInTerminal(buf)
@@ -3099,11 +3096,11 @@ func Test_linematch_3diffs_sanity_check()
END
call writefile(lines, 'Xlinematch_3diffs.mnv', 'D')
call writefile(['abcd', 'def', 'hij'], 'Xfile_linematch1', 'D')
- call writefilMNV'defq', 'hijk', 'nopq'], 'Xfile_linematch2', 'D')
+ call writefile(['defq', 'hijk', 'nopq'], 'Xfile_linematch2', 'D')
call writefile(['hijklm', 'nopqr', 'stuv'], 'Xfile_linematch3', 'D')
call WriteDiffFiles3(0, [], [], [])
let buf = RunMNVInTerminal('-d -S Xlinematch_3diffs.mnv Xfile_linematch1 Xfile_linematch2 Xfile_linematch3', {})
- call VeriMNVcreenDump(buf, 'Test_linematch_3diffs2', {})
+ call VerifyScreenDump(buf, 'Test_linematch_3diffs2', {})
" clean up
call StopMNVInTerminal(buf)
@@ -3115,7 +3112,7 @@ func Test_diffanchors()
\ ["anchorA1", "1", "2", "3",
\ "100", "101", "102", "anchorB", "103", "104", "105"],
\ ["100", "101", "102", "anchorB", "103", "104", "105",
- \ "anchoMNV", "1", "2", "3"],
+ \ "anchorA2", "1", "2", "3"],
\ ["100", "anchorB", "103",
\ "anchorA3", "1", "2", "3"])
let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2 Xdifile3', {})
@@ -3167,7 +3164,7 @@ func Test_diffanchors()
call VerifyInternal(buf, "Test_diff_anchors_02", " diffopt+=anchor")
" Test multiple diff anchors on the same line in file 1.
- call term_sendkeys(buf, ":1wincmd w\<CR>:setlocal dia=1,1\<CMNV)
+ call term_sendkeys(buf, ":1wincmd w\<CR>:setlocal dia=1,1\<CR>")
call VerifyInternal(buf, "Test_diff_anchors_04", " diffopt+=anchor")
" Test that if one file has fewer diff anchors than others. MNV should only
@@ -3187,7 +3184,7 @@ func Test_diffanchors()
" Intentionally set an invalid anchor with wrong line number. Should fall
" back to treat it as if no anchors are used at all.
- call termMNVndkeys(buf, ":1wincmd w\<CR>:setlocal dia=1,10,8,2,1000 | silent! diffupdate\<CR>:")
+ call term_sendkeys(buf, ":1wincmd w\<CR>:setlocal dia=1,10,8,2,1000 | silent! diffupdate\<CR>:")
call VerifyScreenDump(buf, "Test_diff_anchors_00", {})
call StopMNVInTerminal(buf)
@@ -3199,7 +3196,7 @@ func Test_diffanchors_scrollbind_topline()
CheckScreendump
" Simple overlapped line anchored to be adjacent to each other
- call WriteDifMNVles(0,
+ call WriteDiffFiles(0,
\ ["anchor1", "diff1a", "anchor2"],
\ ["anchor1", "diff2a", "anchor2"])
let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2', {})
@@ -3220,7 +3217,7 @@ func Test_diffanchors_scrollbind_topline()
call VerifyInternal(buf, "Test_diff_anchors_scrollbind_topline_05", " diffopt+=anchor diffopt-=filler")
call term_sendkeys(buf, "\<Esc>\<C-E>")
call VerifyScreenDump(buf, "Test_diff_anchors_scrollbind_topline_06", {})
- call termMNVndkeys(buf, "\<C-E>")
+ call term_sendkeys(buf, "\<C-E>")
call VerifyScreenDump(buf, "Test_diff_anchors_scrollbind_topline_07", {})
call StopMNVInTerminal(buf)
@@ -3231,7 +3228,7 @@ func Test_diffanchors_scrollbind_topline2()
" More-complicated case with 3 files and multiple overlapping diff blocks
call WriteDiffFiles3(0,
- \ ["anchoMNV],
+ \ ["anchor1"],
\ ["diff2a", "diff2b", "diff2c", "diff2d", "anchor2"],
\ ["diff3a", "diff3c", "diff3d", "anchor3", "diff3e"])
let buf = RunMNVInTerminal('-d Xdifile1 Xdifile2 Xdifile3', {})
@@ -3260,7 +3257,7 @@ func Test_diffanchors_scrollbind_topline2()
call VerifyScreenDump(buf, "Test_diff_anchors_scrollbind_topline_15", {})
call term_sendkeys(buf, "\<C-E>")
call VerifyScreenDump(buf, "Test_diff_anchors_scrollbind_topline_16", {})
- call termMNVndkeys(buf, "\<C-E>")
+ call term_sendkeys(buf, "\<C-E>")
call VerifyScreenDump(buf, "Test_diff_anchors_scrollbind_topline_17", {})
call StopMNVInTerminal(buf)
@@ -3563,16 +3560,16 @@ func Test_diff_add_prop_in_autocmd()
autocmd OptionSet diff call prop_add(1, 1, #{type: 'myprop', length: 100})
set diffexpr=MyDiff()
END
- call writefilMNVines, 'Xtest_diff_add_prop_in_autocmd', 'D')
+ call writefile(lines, 'Xtest_diff_add_prop_in_autocmd', 'D')
call writefile(['foo', 'bar', 'baz'], 'Xdiffsplit_file', 'D')
let buf = RunMNVInTerminal('-S Xtest_diff_add_prop_in_autocmd', {})
- call termMNVndkeys(buf, ":diffsplit Xdiffsplit_file\<CR>")
+ call term_sendkeys(buf, ":diffsplit Xdiffsplit_file\<CR>")
call VerifyScreenDump(buf, 'Test_diff_add_prop_in_autocmd_01', {})
call StopMNVInTerminal(buf)
endfunc
-MNV
+
" this was causing a use-after-free by calling winframe_remove() recursively
func Test_diffexpr_wipe_buffers()
CheckRunMNVInTerminal
@@ -3595,11 +3592,11 @@ func Test_diffexpr_wipe_buffers()
wincm w
hid
%bw!
- ENDMNV
+ END
call writefile(lines, 'Xtest_diffexpr_wipe', 'D')
let buf = RunMNVInTerminal('Xtest_diffexpr_wipe', {})
- call termMNVndkeys(buf, ":so\<CR>")
+ call term_sendkeys(buf, ":so\<CR>")
call WaitForAssert({-> assert_match('4 buffers wiped out', term_getline(buf, 20))})
call StopMNVInTerminal(buf)
@@ -3614,7 +3611,7 @@ func Test_diffput_to_empty_buf()
windo diffthis
windo set cursorline nofoldenable
wincmd t
- ENDMNV
+ END
call writefile(lines, 'Xtest_diffput_to_empty_buf', 'D')
let buf = RunMNVInTerminal('-S Xtest_diffput_to_empty_buf', {})
@@ -3625,7 +3622,7 @@ func Test_diffput_to_empty_buf()
call VerifyScreenDump(buf, 'Test_diffput_to_empty_buf_02', {})
call term_sendkeys(buf, ":redraw!\<CR>")
call VerifyScreenDump(buf, 'Test_diffput_to_empty_buf_02', {})
- call termMNVndkeys(buf, 'j')
+ call term_sendkeys(buf, 'j')
call VerifyScreenDump(buf, 'Test_diffput_to_empty_buf_03', {})
call StopMNVInTerminal(buf)
diff --git a/uvim/src/testdir/test_ex_mode.mnv b/uvim/src/testdir/test_ex_mode.mnv
index 953f3bc80d..7e12a2d737 100644
--- a/uvim/src/testdir/test_ex_mode.mnv
+++ b/uvim/src/testdir/test_ex_mode.mnv
@@ -345,19 +345,14 @@ endfunc
func Test_backslash_multiline()
new
call setline(1, 'enum')
- call feedkeys('Qg/enum/i\
-\
-.', "xt")
+ call feedkeys('Qg/enum/i\ \ .', "xt")
call assert_equal(["", "enum"], getline(1, 2))
endfunc
" Test using backslash in ex-mode after patch 9.1.0535
func Test_backslash_multiline2()
new
- call feedkeys('Qa
-X \\
-Y
-.', "xt")
+ call feedkeys('Qa X \\ Y .', "xt")
call assert_equal(['X \\', "Y"], getline(1, 2))
endfunc
diff --git a/uvim/src/testdir/test_expr.mnv b/uvim/src/testdir/test_expr.mnv
index 365d4d3f5e..fd5f6e8473 100644
--- a/uvim/src/testdir/test_expr.mnv
+++ b/uvim/src/testdir/test_expr.mnv
@@ -37,8 +37,8 @@ func Test_version()
call assert_true(has('patch-7.4.123 ')) " Trailing space can be allowed.
call assert_true(has('patch-9.1.0'))
call assert_true(has('patch-9.1.0000'))
- call assert_true(has('patch-9.2.0'))
- call assert_true(has('patch-9.2.0000'))
+ call assert_true(has('patch-10.0.0'))
+ call assert_true(has('patch-10.0.0000'))
call assert_false(has('patch-7'))
call assert_false(has('patch-7.4'))
diff --git a/uvim/src/testdir/test_fold.mnv b/uvim/src/testdir/test_fold.mnv
index b8a89739f0..b31aa51676 100644
--- a/uvim/src/testdir/test_fold.mnv
+++ b/uvim/src/testdir/test_fold.mnv
@@ -2010,8 +2010,7 @@ func Test_indent_with_L_command()
" The "L" command moved the cursor to line zero, causing the text saved for
" undo to use line number -1, which caused trouble for undo later.
new
- sil! norm 8R
-V{zf8=Lu
+ sil! norm 8R V{zf8=Lu
bwipe!
endfunc
diff --git a/uvim/src/testdir/test_increment_dbcs.mnv b/uvim/src/testdir/test_increment_dbcs.mnv
index de4ebb900d..6d0d943bfa 100644
--- a/uvim/src/testdir/test_increment_dbcs.mnv
+++ b/uvim/src/testdir/test_increment_dbcs.mnv
@@ -14,14 +14,14 @@ endfunc
func Test_increment_dbcs_1()
set nrformats+=alpha
- call setline(1, ["�R1"])
+ call setline(1, ["R1"])
exec "norm! 0\<C-A>"
- call assert_equal(["�R2"], getline(1, '$'))
+ call assert_equal(["R2"], getline(1, '$'))
call assert_equal([0, 1, 3, 0], getpos('.'))
- call setline(1, ["�`�a�b0xDE�e"])
+ call setline(1, ["`ab0xDEe"])
exec "norm! 0\<C-X>"
- call assert_equal(["�`�a�b0xDD�e"], getline(1, '$'))
+ call assert_equal(["`ab0xDDe"], getline(1, '$'))
call assert_equal([0, 1, 10, 0], getpos('.'))
endfunc
diff --git a/uvim/src/testdir/test_put.mnv b/uvim/src/testdir/test_put.mnv
index ddb782077a..03ee4331c0 100644
--- a/uvim/src/testdir/test_put.mnv
+++ b/uvim/src/testdir/test_put.mnv
@@ -229,9 +229,7 @@ func Test_put_visual_mode()
set selection=exclusive
exe "norm o\t"
m0
- sil! norm 
-p
-p
+ sil! norm  p p
bwipe!
set selection&
@@ -248,7 +246,7 @@ func Test_put_visual_block_mode()
set ve=
endfunc
-func Test_MNV_other_window()
+func Test_put_other_window()
CheckScreendump
CheckRunMNVInTerminal
@@ -259,16 +257,16 @@ func Test_MNV_other_window()
put =' two more text'
put =' three more text'
put =' four more text'
- ENDMNV
+ END
call writefile(lines, 'Xtest_put_other', 'D')
let buf = RunMNVInTerminal('-S Xtest_put_other', #{rows: 10})
- call VeriMNVcreenDump(buf, 'Test_put_other_window_1', {})
+ call VerifyScreenDump(buf, 'Test_put_other_window_1', {})
call StopMNVInTerminal(buf)
endfunc
-func Test_MNV_in_last_displayed_line()
+func Test_put_in_last_displayed_line()
CheckScreendump
CheckRunMNVInTerminal
@@ -278,11 +276,11 @@ func Test_MNV_in_last_displayed_line()
@a = 'x'->repeat(&columns * 2 - 2)
range(&lines)->setline(1)
feedkeys('G"ap')
- ENDMNV
+ END
call writefile(lines, 'Xtest_put_last_line', 'D')
let buf = RunMNVInTerminal('-S Xtest_put_last_line', #{rows: 10})
- call VeriMNVcreenDump(buf, 'Test_put_in_last_displayed_line_1', {})
+ call VerifyScreenDump(buf, 'Test_put_in_last_displayed_line_1', {})
call StopMNVInTerminal(buf)
endfunc
diff --git a/uvim/src/testdir/test_regex_char_classes.mnv b/uvim/src/testdir/test_regex_char_classes.mnv
index b368315c04..ee4e1057dd 100644
--- a/uvim/src/testdir/test_regex_char_classes.mnv
+++ b/uvim/src/testdir/test_regex_char_classes.mnv
@@ -64,22 +64,22 @@ func Test_regex_char_classes()
let save_enc = &encoding
set encoding=utf-8
- let input = "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"
+ let input = "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"
" Format is [cmd_to_run, expected_output]
let tests = [
\ [':s/\%#=0\d//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1\d//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2\d//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0[0-9]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1[0-9]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2[0-9]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0\D//g',
\ "0123456789"],
\ [':s/\%#=1\D//g',
@@ -93,17 +93,17 @@ func Test_regex_char_classes()
\ [':s/\%#=2[^0-9]//g',
\ "0123456789"],
\ [':s/\%#=0\o//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1\o//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2\o//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0[0-7]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1[0-7]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2[0-7]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./89:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0\O//g',
\ "01234567"],
\ [':s/\%#=1\O//g',
@@ -117,17 +117,17 @@ func Test_regex_char_classes()
\ [':s/\%#=2[^0-7]//g',
\ "01234567"],
\ [':s/\%#=0\x//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1\x//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2\x//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0[0-9A-Fa-f]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1[0-9A-Fa-f]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2[0-9A-Fa-f]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@GHIXYZ[\]^_`ghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0\X//g',
\ "0123456789ABCDEFabcdef"],
\ [':s/\%#=1\X//g',
@@ -141,17 +141,17 @@ func Test_regex_char_classes()
\ [':s/\%#=2[^0-9A-Fa-f]//g',
\ "0123456789ABCDEFabcdef"],
\ [':s/\%#=0\w//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1\w//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2\w//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0[0-9A-Za-z_]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1[0-9A-Za-z_]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2[0-9A-Za-z_]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0\W//g',
\ "0123456789ABCDEFGHIXYZ_abcdefghiwxyz"],
\ [':s/\%#=1\W//g',
@@ -165,17 +165,17 @@ func Test_regex_char_classes()
\ [':s/\%#=2[^0-9A-Za-z_]//g',
\ "0123456789ABCDEFGHIXYZ_abcdefghiwxyz"],
\ [':s/\%#=0\h//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1\h//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2\h//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0[A-Za-z_]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1[A-Za-z_]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2[A-Za-z_]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0\H//g',
\ "ABCDEFGHIXYZ_abcdefghiwxyz"],
\ [':s/\%#=1\H//g',
@@ -189,17 +189,17 @@ func Test_regex_char_classes()
\ [':s/\%#=2[^A-Za-z_]//g',
\ "ABCDEFGHIXYZ_abcdefghiwxyz"],
\ [':s/\%#=0\a//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1\a//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2\a//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0[A-Za-z]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1[A-Za-z]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2[A-Za-z]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0\A//g',
\ "ABCDEFGHIXYZabcdefghiwxyz"],
\ [':s/\%#=1\A//g',
@@ -213,17 +213,17 @@ func Test_regex_char_classes()
\ [':s/\%#=2[^A-Za-z]//g',
\ "ABCDEFGHIXYZabcdefghiwxyz"],
\ [':s/\%#=0\l//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1\l//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2\l//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0[a-z]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1[a-z]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2[a-z]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0\L//g',
\ "abcdefghiwxyz"],
\ [':s/\%#=1\L//g',
@@ -237,17 +237,17 @@ func Test_regex_char_classes()
\ [':s/\%#=2[^a-z]//g',
\ "abcdefghiwxyz"],
\ [':s/\%#=0\u//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1\u//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2\u//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0[A-Z]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1[A-Z]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2[A-Z]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./0123456789:;<=>?@[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0\U//g',
\ "ABCDEFGHIXYZ"],
\ [':s/\%#=1\U//g',
@@ -261,17 +261,17 @@ func Test_regex_char_classes()
\ [':s/\%#=2[^A-Z]//g',
\ "ABCDEFGHIXYZ"],
\ [':s/\%#=0\%' . line('.') . 'l^\t...//g',
- \ "!\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "!\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1\%' . line('.') . 'l^\t...//g',
- \ "!\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "!\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2\%' . line('.') . 'l^\t...//g',
- \ "!\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "!\"#$%&'()#+'-./0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0[0-z]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=1[0-z]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=2[0-z]//g',
- \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./{|}~\<C-?>\u0080\u0082\u0090\u009b������"],
+ \ "\t\<C-L>\<C-M> !\"#$%&'()#+'-./{|}~\<C-?>\u0080\u0082\u0090\u009b"],
\ [':s/\%#=0[^0-z]//g',
\ "0123456789:;<=>?@ABCDEFGHIXYZ[\]^_`abcdefghiwxyz"],
\ [':s/\%#=1[^0-z]//g',
diff --git a/uvim/src/testdir/test_regexp_utf8.mnv b/uvim/src/testdir/test_regexp_utf8.mnv
index 35698ef579..e2e4f52f3e 100644
--- a/uvim/src/testdir/test_regexp_utf8.mnv
+++ b/uvim/src/testdir/test_regexp_utf8.mnv
@@ -387,8 +387,8 @@ func Run_regexp_multibyte_magic()
b ちカヨは
c x ¬€x
d 天使x
- e ������y
- f ������z
+ e y
+ f z
g a啷bb
j 0123❤x
k combinations