updated for version 7.3.887

Problem:    No tests for Visual mode operators, what 7.3.879 fixes.
Solution:   Add a new test file. (David Bürgin)

diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index d3f6b525e8f3c1ab80facfda0bc91d5bd3208c23..66c3243576f994a8f7bd03ba33f0b9ab8d676c14 100644 (file)
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -32,7 +32,8 @@ 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 test92.out test93.out
+               test89.out test90.out test91.out test92.out test93.out \
+               test94.out
 
 .SUFFIXES: .in .out
 
@@ -142,3 +143,4 @@ test90.out: test90.in
 test91.out: test91.in
 test92.out: test92.in
 test93.out: test93.in
+test94.out: test94.in

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 9942ca4be5c456f137b5550c029ebc5d318c769d..3c2f9386b4211c152a174bad42963a01d081954f 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -31,7 +31,8 @@ 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 test92.out test93.out
+               test89.out test90.out test91.out test92.out test93.out \
+               test94.out
 
 SCRIPTS32 =    test50.out test70.out
 

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 2a87a6b1fe1bdaec213f767846c2d6042df87acb..6ae101b070e0230c3cb5c761ea22084621474944 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -51,7 +51,8 @@ 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 test92.out test93.out
+               test89.out test90.out test91.out test92.out test93.out \
+               test94.out
 
 SCRIPTS32 =    test50.out test70.out
 

diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index 31302b16057bef2baddef47046804e3373901b16..2d6543b437ff1e520727e0069c3a3795829951c9 100644 (file)
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -32,7 +32,8 @@ 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 test92.out test93.out
+               test89.out test90.out test91.out test92.out test93.out \
+               test94.out
 
 .SUFFIXES: .in .out
 

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 7570a71b05a14c1c05f69fc7a1a2a0057fd27572..7770a6e7f089807ae8a0e01ea30bc90b05fa558a 100644 (file)
--- 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-02-21
+# Last change:  2013 Apr 12
 #
 # 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 test92.out test93.out
+        test90.out test91.out test92.out test93.out test94.out
 
 # Known problems:
 # Test 30: a problem around mac format - unknown reason

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 43acc45eb31aaa4293975c8b8c763582ef9535fc..bcaed91d233113e897562d96fc59f1234bdb793e 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -28,7 +28,8 @@ 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 test92.out test93.out
+               test89.out test90.out test91.out test92.out test93.out \
+               test94.out
 
 SCRIPTS_GUI = test16.out
 

diff --git a/src/testdir/test94.in b/src/testdir/test94.in
new file mode 100644 (file)
index 0000000..1d32f55
--- /dev/null
+++ b/src/testdir/test94.in
@@ -0,0 +1,98 @@
+Test for Visual mode and operators
+
+Tests for the two kinds of operations: Those executed with Visual mode
+followed by an operator and those executed via Operator-pending mode. Also
+part of the test are mappings, counts, and repetition with the . command.
+
+Test cases:
+- Visual modes (v V CTRL-V) followed by an operator; count; repeating
+- Visual mode maps; count; repeating
+  - Simple
+  - With an Ex command (custom text object)
+- Operator-pending mode maps
+  - Simple
+  - With Ex command moving the cursor
+  - With Ex command and Visual selection (custom text object)
+- Patch 7.3.879: Properly abort Ex command in Operator-pending mode
+
+STARTTEST
+:so small.vim
+:set nocp
+:
+:" User functions
+:function MoveToCap()
+:  call search('\u', 'W')
+:endfunction
+:function SelectInCaps()
+:  let [line1, col1] = searchpos('\u', 'bcnW')
+:  let [line2, col2] = searchpos('.\u', 'nW')
+:  call setpos("'<", [0, line1, col1, 0])
+:  call setpos("'>", [0, line2, col2, 0])
+:  normal! gv
+:endfunction
+:function MoveToEndCount(count)
+:  normal! v:count . e
+:endfunction
+:
+:" Visual modes followed by operator
+/^apple
+lvld.l3vd.:
+/^line 1
+Vcnewline\ej.j2Vd.:
+/^xxxx
+\16jlc  \el.l2\16c----\el.:
+:
+:" Visual mode maps (movement and text object)
+:vnoremap W /\u/s-1<CR>
+:vnoremap iW :<C-U>call SelectInCaps()<CR>
+/^Kiwi
+vWcNo\el.fD2vd.:
+/^Jambu
+llviWc-\el.l2vdl.:
+:
+:" Operator-pending mode maps (movement and text object)
+:onoremap W /\u/<CR>
+:onoremap <Leader>W :<C-U>call MoveToCap()<CR>
+:onoremap iW :<C-U>call SelectInCaps()<CR>
+/^Pineapple
+cW-\el.l2.l.:
+/^Juniper
+g?\WfD.:
+/^Lemon
+yiWPlciWNew\e:
+:
+:" Patch 7.3.879: Properly abort Operator-pending mode for "dv:<Esc>" etc.
+/^zzzz
+dV:\rdv:\r:set noma | let v:errmsg = ''
+d:\r:set ma | put = v:errmsg =~# '^E21' ? 'ok' : 'failed'
+dv:\edV:\e:set noma | let v:errmsg = ''
+d:\e:set ma | put = v:errmsg =~# '^E21' ? 'failed' : 'ok'
+:/^start:/+2,$w! test.out
+:q!
+ENDTEST
+
+start:
+
+apple banana cherry
+
+line 1 line 1
+line 2 line 2
+line 3 line 3
+line 4 line 4
+line 5 line 5
+line 6 line 6
+
+xxxxxxxxxxxxx
+xxxxxxxxxxxxx
+xxxxxxxxxxxxx
+xxxxxxxxxxxxx
+
+KiwiRaspberryDateWatermelonPeach
+JambuRambutanBananaTangerineMango
+
+PineappleQuinceLoganberryOrangeGrapefruitKiwiZ
+JuniperDurianZ
+LemonNectarineZ
+
+zzzz
+zzzz

diff --git a/src/testdir/test94.ok b/src/testdir/test94.ok
new file mode 100644 (file)
index 0000000..56bccc9
--- /dev/null
+++ b/src/testdir/test94.ok
@@ -0,0 +1,20 @@
+a y
+
+newline
+newline
+
+    --------x
+    --------x
+xxxx--------x
+xxxx--------x
+
+NoNoberryach
+--ago
+
+----Z
+WhavcreQhevnaZ
+LemonNewNectarineZ
+
+zzz
+ok
+ok

diff --git a/src/version.c b/src/version.c
index 8605c5188bad71a6aadf94f9567f18a0dafb51b2..bf6385a08c287492c4f3c4ad7019a4fedf9086c8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    887,
 /**/
     886,
 /**/