diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ex_docmd.c | 2 | ||||
| -rw-r--r-- | src/testdir/Make_amiga.mak | 4 | ||||
| -rw-r--r-- | src/testdir/Make_dos.mak | 2 | ||||
| -rw-r--r-- | src/testdir/Make_ming.mak | 2 | ||||
| -rw-r--r-- | src/testdir/Make_os2.mak | 2 | ||||
| -rw-r--r-- | src/testdir/Make_vms.mms | 4 | ||||
| -rw-r--r-- | src/testdir/Makefile | 2 | ||||
| -rw-r--r-- | src/testdir/test92.in | 48 | ||||
| -rw-r--r-- | src/testdir/test92.ok | 26 | ||||
| -rw-r--r-- | src/testdir/test93.in | 48 | ||||
| -rw-r--r-- | src/testdir/test93.ok | 26 | ||||
| -rw-r--r-- | src/version.c | 2 |
12 files changed, 160 insertions, 8 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 62ae3ad2e..89b523495 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -10839,7 +10839,7 @@ put_view(fd, wp, add_edit, flagp, current_arg_idx) (long)wp->w_virtcol + 1) < 0 || put_eol(fd) == FAIL || put_line(fd, "else") == FAIL - || fprintf(fd, " normal! %d|", wp->w_virtcol + 1) < 0 + || fprintf(fd, " normal! 0%d|", wp->w_virtcol + 1) < 0 || put_eol(fd) == FAIL || put_line(fd, "endif") == FAIL) return FAIL; diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak index 0e18992de..d3f6b525e 100644 --- a/src/testdir/Make_amiga.mak +++ b/src/testdir/Make_amiga.mak @@ -32,7 +32,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \ test71.out test72.out test73.out test74.out test75.out \ test76.out test77.out test78.out test79.out test80.out \ test81.out test82.out test83.out test84.out test88.out \ - test89.out test90.out test91.out + test89.out test90.out test91.out test92.out test93.out .SUFFIXES: .in .out @@ -140,3 +140,5 @@ test88.out: test88.in test89.out: test89.in test90.out: test90.in test91.out: test91.in +test92.out: test92.in +test93.out: test93.in diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak index 968cf6ca1..9942ca4be 100644 --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -31,7 +31,7 @@ SCRIPTS = test3.out test4.out test5.out test6.out test7.out \ test74.out test75.out test76.out test77.out test78.out \ test79.out test80.out test81.out test82.out test83.out \ test84.out test85.out test86.out test87.out test88.out \ - test89.out test90.out test91.out + test89.out test90.out test91.out test92.out test93.out SCRIPTS32 = test50.out test70.out diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak index 9d845ab94..2a87a6b1f 100644 --- a/src/testdir/Make_ming.mak +++ b/src/testdir/Make_ming.mak @@ -51,7 +51,7 @@ SCRIPTS = test3.out test4.out test5.out test6.out test7.out \ test74.out test75.out test76.out test77.out test78.out \ test79.out test80.out test81.out test82.out test83.out \ test84.out test85.out test86.out test87.out test88.out \ - test89.out test90.out test91.out + test89.out test90.out test91.out test92.out test93.out SCRIPTS32 = test50.out test70.out diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak index bddfd5ec9..31302b160 100644 --- a/src/testdir/Make_os2.mak +++ b/src/testdir/Make_os2.mak @@ -32,7 +32,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \ test71.out test72.out test73.out test74.out test75.out \ test76.out test77.out test78.out test79.out test80.out \ test81.out test82.out test83.out test84.out test88.out \ - test89.out test90.out test91.out + test89.out test90.out test91.out test92.out test93.out .SUFFIXES: .in .out diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms index f19dd5a34..7570a71b0 100644 --- a/src/testdir/Make_vms.mms +++ b/src/testdir/Make_vms.mms @@ -4,7 +4,7 @@ # Authors: Zoltan Arpadffy, <arpadffy@polarhome.com> # Sandor Kopanyi, <sandor.kopanyi@mailbox.hu> # -# Last change: 2013 Feb 20 +# Last change: 2013-02-21 # # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64. # Edit the lines in the Configuration section below to select. @@ -77,7 +77,7 @@ SCRIPT = test1.out test2.out test3.out test4.out test5.out \ test71.out test72.out test74.out test75.out test76.out \ test77.out test78.out test79.out test80.out test81.out \ test82.out test83.out test84.out test88.out test89.out \ - test90.out test91.out + test90.out test91.out test92.out test93.out # Known problems: # Test 30: a problem around mac format - unknown reason diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 8b31b91eb..43acc45eb 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -28,7 +28,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \ test74.out test75.out test76.out test77.out test78.out \ test79.out test80.out test81.out test82.out test83.out \ test84.out test85.out test86.out test87.out test88.out \ - test89.out test90.out test91.out + test89.out test90.out test91.out test92.out test93.out SCRIPTS_GUI = test16.out diff --git a/src/testdir/test92.in b/src/testdir/test92.in new file mode 100644 index 000000000..e61483294 --- /dev/null +++ b/src/testdir/test92.in @@ -0,0 +1,48 @@ +vim: set ft=vim fenc=utf-8: + +Tests if :mksession saves cursor columns correctly in presence of tab and +multibyte characters when fileencoding=utf-8. + +STARTTEST +:so mbyte.vim +:if !has('mksession') +: e! test.ok +: wq! test.out +:endif +:set sessionoptions=buffers splitbelow fileencoding=utf-8 +/^start: +:vsplit +j16|:split +j16|:split +j16|:split +j8|:split +j8|:split +j16|:split +j16|:split +j16|:wincmd l +/^start: +:set nowrap +j16|3zl:split +j016|3zl:split +j016|3zl:split +j08|3zl:split +j08|3zl:split +j016|3zl:split +j016|3zl:split +j016|3zl:split +:mksession! test.out +:new test.out +:v/\(^ *normal! 0\|^ *exe 'normal!\)/d +:w +:qa! +ENDTEST + +start: +no multibyte chAracter + one leaDing tab + four leadinG spaces +two consecutive tabs +two tabs in one line +one … multibyteCharacter +a “b” two multiByte characters +“c”1€ three mulTibyte characters diff --git a/src/testdir/test92.ok b/src/testdir/test92.ok new file mode 100644 index 000000000..cca5ec487 --- /dev/null +++ b/src/testdir/test92.ok @@ -0,0 +1,26 @@ +normal! 016| +normal! 016| +normal! 016| +normal! 08| +normal! 08| +normal! 016| +normal! 016| +normal! 016| + exe 'normal! ' . s:c . '|zs' . 16 . '|' + normal! 016| + exe 'normal! ' . s:c . '|zs' . 16 . '|' + normal! 016| + exe 'normal! ' . s:c . '|zs' . 16 . '|' + normal! 016| + exe 'normal! ' . s:c . '|zs' . 8 . '|' + normal! 08| + exe 'normal! ' . s:c . '|zs' . 8 . '|' + normal! 08| + exe 'normal! ' . s:c . '|zs' . 16 . '|' + normal! 016| + exe 'normal! ' . s:c . '|zs' . 16 . '|' + normal! 016| + exe 'normal! ' . s:c . '|zs' . 16 . '|' + normal! 016| + exe 'normal! ' . s:c . '|zs' . 16 . '|' + normal! 016| diff --git a/src/testdir/test93.in b/src/testdir/test93.in new file mode 100644 index 000000000..8444ba513 --- /dev/null +++ b/src/testdir/test93.in @@ -0,0 +1,48 @@ +vim: set ft=vim fenc=latin1: + +Tests if :mksession saves cursor columns correctly in presence of tab and +multibyte characters when fileencoding=latin1. + +STARTTEST +:so mbyte.vim +:if !has('mksession') +: e! test.ok +: wq! test.out +:endif +:set sessionoptions=buffers splitbelow fileencoding=latin1 +/^start: +:vsplit +j16|:split +j16|:split +j16|:split +j8|:split +j8|:split +j16|:split +j16|:split +j16|:wincmd l +/^start: +:set nowrap +j16|3zl:split +j016|3zl:split +j016|3zl:split +j08|3zl:split +j08|3zl:split +j016|3zl:split +j016|3zl:split +j016|3zl:split +:mksession! test.out +:new test.out +:v/\(^ *normal! 0\|^ *exe 'normal!\)/d +:w +:qa! +ENDTEST + +start: +no multibyte chAracter + one leaDing tab + four leadinG spaces +two consecutive tabs +two tabs in one line +one multibyteCharacter +a two multiByte characters +A three mulTibyte characters diff --git a/src/testdir/test93.ok b/src/testdir/test93.ok new file mode 100644 index 000000000..cca5ec487 --- /dev/null +++ b/src/testdir/test93.ok @@ -0,0 +1,26 @@ +normal! 016| +normal! 016| +normal! 016| +normal! 08| +normal! 08| +normal! 016| +normal! 016| +normal! 016| + exe 'normal! ' . s:c . '|zs' . 16 . '|' + normal! 016| + exe 'normal! ' . s:c . '|zs' . 16 . '|' + normal! 016| + exe 'normal! ' . s:c . '|zs' . 16 . '|' + normal! 016| + exe 'normal! ' . s:c . '|zs' . 8 . '|' + normal! 08| + exe 'normal! ' . s:c . '|zs' . 8 . '|' + normal! 08| + exe 'normal! ' . s:c . '|zs' . 16 . '|' + normal! 016| + exe 'normal! ' . s:c . '|zs' . 16 . '|' + normal! 016| + exe 'normal! ' . s:c . '|zs' . 16 . '|' + normal! 016| + exe 'normal! ' . s:c . '|zs' . 16 . '|' + normal! 016| diff --git a/src/version.c b/src/version.c index 6e42c6673..a4e461e95 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 838, +/**/ 837, /**/ 836, |