To: vim_dev@googlegroups.com
Subject: Patch 8.1.2384
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.1.2384
Problem:    Test 48 is old style.
Solution:   Merge test cases into new style test. (Yegappan Lakshmanan,
            closes #5307)
Files:	    src/Makefile, src/testdir/Make_all.mak, src/testdir/Make_vms.mms,
            src/testdir/test48.in, src/testdir/test48.ok,
            src/testdir/test_virtualedit.vim


*** ../vim-8.1.2383/src/Makefile	2019-11-21 17:13:12.620361368 +0100
--- src/Makefile	2019-12-03 22:56:07.150906734 +0100
***************
*** 2252,2258 ****
  test1 \
  	test_eval \
  	test39 \
! 	test42 test44 test48 test49 \
  	test52 test59 \
  	test64 test69 \
  	test70 test72 \
--- 2254,2260 ----
  test1 \
  	test_eval \
  	test39 \
! 	test42 test44 test49 \
  	test52 test59 \
  	test64 test69 \
  	test70 test72 \
*** ../vim-8.1.2383/src/testdir/Make_all.mak	2019-11-25 15:40:28.853612211 +0100
--- src/testdir/Make_all.mak	2019-12-03 22:56:07.150906734 +0100
***************
*** 16,22 ****
  	test39.out \
  	test42.out \
  	test44.out \
- 	test48.out \
  	test64.out \
  	test69.out \
  	test70.out \
--- 16,21 ----
*** ../vim-8.1.2383/src/testdir/Make_vms.mms	2019-07-04 17:35:01.119169967 +0200
--- src/testdir/Make_vms.mms	2019-12-03 22:56:07.150906734 +0100
***************
*** 75,81 ****
  
  SCRIPT = test1.out \
         test39.out \
!        test42.out test44.out test48.out test49.out \
         test64.out test69.out \
         test72.out test77a.out test88.out \
         test94.out test95.out test99.out \
--- 75,81 ----
  
  SCRIPT = test1.out \
         test39.out \
!        test42.out test44.out test49.out \
         test64.out test69.out \
         test72.out test77a.out test88.out \
         test94.out test95.out test99.out \
*** ../vim-8.1.2383/src/testdir/test48.in	2015-01-07 13:50:22.000000000 +0100
--- src/testdir/test48.in	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,83 ****
- This is a test of 'virtualedit'.
- 
- STARTTEST
- :so small.vim
- :set noswf
- :set ve=all
- -dgg
- :"
- :"   Insert "keyword keyw", ESC, C CTRL-N, shows "keyword ykeyword".
- :"    Repeating CTRL-N fixes it. (Mary Ellen Foster)
- 2/w
- C
- :"
- :"   Using "C" then then <CR> moves the last remaining character to the next
- :"    line.  (Mary Ellen Foster)
- j^/are
- C
are belong to vim
- :"
- :"   When past the end of a line that ends in a single character "b" skips
- :"    that word.
- ^$15lbC7
- :"
- :"   Make sure 'i' works
- $4li<-- should be 3 ' '
- :"
- :"   Make sure 'C' works
- $4lC<-- should be 3 ' '
- :"
- :"   Make sure 'a' works
- $4la<-- should be 4 ' '
- :"
- :"   Make sure 'A' works
- $4lA<-- should be 0 ' '
- :"
- :"   Make sure 'D' works
- $4lDi<-- 'D' should be intact
- :"
- :"   Test for yank bug reported by Mark Waggoner.
- :set ve=block
- ^2w3jyGp
- :"
- :" Test "r" beyond the end of the line
- :set ve=all
- /^"r"
- $5lrxa<-- should be 'x'
- :"
- :" Test "r" on a tab
- :" Note that for this test, 'ts' must be 8 (the default).
- ^5lrxA<-- should be '  x  '
- :"
- :"   Test to make sure 'x' can delete control characters
- :set display=uhex
- ^xxxxxxi[This line should contain only the text between the brackets.]
- :set display=
- :"
- :"   Test for ^Y/^E due to bad w_virtcol value, reported by
- :"   Roy <royl@netropolis.net>.
- ^O3li4li4li   <-- should show the name of a noted text editor
- ^o4li4li4li   <-- and its version number-dd
- :"
- :" Test for yanking and pasting using the small delete register
- gg/^foo
- dewve"-p
- :wq! test.out
- ENDTEST
- foo, bar
- keyword keyw
- all your base are belong to us
- 1 2 3 4 5 6
- 'i'
- 'C'
- 'a'
- 'A'
- 'D'
- this is a test
- this is a test
- this is a test
- "r"
- "r"	
- ab
sd
- abcv6efi.him0kl
- 
- 
--- 0 ----
*** ../vim-8.1.2383/src/testdir/test48.ok	2015-01-07 13:44:09.000000000 +0100
--- src/testdir/test48.ok	1970-01-01 01:00:00.000000000 +0100
***************
*** 1,23 ****
- , foo
- keyword keyword
- all your base 
- are belong to vim
- 1 2 3 4 5 7
- 'i'   <-- should be 3 ' '
- 'C'   <-- should be 3 ' '
- 'a'    <-- should be 4 ' '
- 'A'<-- should be 0 ' '
- 'D'   <-- 'D' should be intact
- this is a test
- this is a test
- this is a test
- "r"    x<-- should be 'x'
- "r"  x  <-- should be '  x  '
- [This line should contain only the text between the brackets.]
-    v   i   m   <-- should show the name of a noted text editor
-     6   .   0   <-- and its version number
- 
- a
- a
- a
-  
--- 0 ----
*** ../vim-8.1.2383/src/testdir/test_virtualedit.vim	2019-12-02 20:41:36.326885014 +0100
--- src/testdir/test_virtualedit.vim	2019-12-03 22:56:07.150906734 +0100
***************
*** 210,213 ****
--- 210,346 ----
    set virtualedit=
  endfunc
  
+ " Insert "keyword keyw", ESC, C CTRL-N, shows "keyword ykeyword".
+ " Repeating CTRL-N fixes it. (Mary Ellen Foster)
+ func Test_ve_completion()
+   new
+   set completeopt&vim
+   set virtualedit=all
+   exe "normal ikeyword keyw\<Esc>C\<C-N>"
+   call assert_equal('keyword keyword', getline(1))
+   bwipe!
+   set virtualedit=
+ endfunc
+ 
+ " Using "C" then then <CR> moves the last remaining character to the next
+ " line.  (Mary Ellen Foster)
+ func Test_ve_del_to_eol()
+   new
+   set virtualedit=all
+   call append(0, 'all your base are belong to us')
+   call search('are', 'w')
+   exe "normal C\<CR>are belong to vim"
+   call assert_equal(['all your base ', 'are belong to vim'], getline(1, 2))
+   bwipe!
+   set virtualedit=
+ endfunc
+ 
+ " When past the end of a line that ends in a single character "b" skips
+ " that word.
+ func Test_ve_b_past_eol()
+   new
+   set virtualedit=all
+   call append(0, '1 2 3 4 5 6')
+   normal gg^$15lbC7
+   call assert_equal('1 2 3 4 5 7', getline(1))
+   bwipe!
+   set virtualedit=
+ endfunc
+ 
+ " Make sure 'i', 'C', 'a', 'A' and 'D' works
+ func Test_ve_ins_del()
+   new
+   set virtualedit=all
+   call append(0, ["'i'", "'C'", "'a'", "'A'", "'D'"])
+   call cursor(1, 1)
+   normal $4lix
+   call assert_equal("'i'   x", getline(1))
+   call cursor(2, 1)
+   normal $4lCx
+   call assert_equal("'C'   x", getline(2))
+   call cursor(3, 1)
+   normal $4lax
+   call assert_equal("'a'    x", getline(3))
+   call cursor(4, 1)
+   normal $4lAx
+   call assert_equal("'A'x", getline(4))
+   call cursor(5, 1)
+   normal $4lDix
+   call assert_equal("'D'   x", getline(5))
+   bwipe!
+   set virtualedit=
+ endfunc
+ 
+ " Test for yank bug reported by Mark Waggoner.
+ func Test_yank_block()
+   new
+   set virtualedit=block
+   call append(0, repeat(['this is a test'], 3))
+   exe "normal gg^2w\<C-V>3jy"
+   call assert_equal("a\na\na\n ", @")
+   bwipe!
+   set virtualedit=
+ endfunc
+ 
+ " Test "r" beyond the end of the line
+ func Test_replace_after_eol()
+   new
+   set virtualedit=all
+   call append(0, '"r"')
+   normal gg$5lrxa
+   call assert_equal('"r"    x', getline(1))
+   bwipe!
+   set virtualedit=
+ endfunc
+ 
+ " Test "r" on a tab
+ " Note that for this test, 'ts' must be 8 (the default).
+ func Test_replace_on_tab()
+   new
+   set virtualedit=all
+   call append(0, "'r'\t")
+   normal gg^5lrxAy
+   call assert_equal("'r'  x  y", getline(1))
+   bwipe!
+   set virtualedit=
+ endfunc
+ 
+ " Test to make sure 'x' can delete control characters
+ func Test_ve_del_ctrl_chars()
+   new
+   set virtualedit=all
+   call append(0, "a\<C-V>b\<CR>sd")
+   set display=uhex
+   normal gg^xxxxxxi[text]
+   set display=
+   call assert_equal('[text]', getline(1))
+   bwipe!
+   set virtualedit=
+ endfunc
+ 
+ " Test for ^Y/^E due to bad w_virtcol value, reported by
+ " Roy <royl@netropolis.net>.
+ func Test_ins_copy_char()
+   new
+   set virtualedit=all
+   call append(0, 'abcv8efi.him2kl')
+   exe "normal gg^O\<Esc>3li\<C-E>\<Esc>4li\<C-E>\<Esc>4li\<C-E>   <--"
+   exe "normal j^o\<Esc>4li\<C-Y>\<Esc>4li\<C-Y>\<Esc>4li\<C-Y>   <--"
+   call assert_equal('   v   i   m   <--', getline(1))
+   call assert_equal('    8   .   2   <--', getline(3))
+   bwipe!
+   set virtualedit=
+ endfunc
+ 
+ " Test for yanking and pasting using the small delete register
+ func Test_yank_paste_small_del_reg()
+   new
+   set virtualedit=all
+   call append(0, "foo, bar")
+   normal ggdewve"-p
+   call assert_equal(', foo', getline(1))
+   bwipe!
+   set virtualedit=
+ endfunc
+ 
  " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.1.2383/src/version.c	2019-12-02 22:49:35.394422805 +0100
--- src/version.c	2019-12-03 22:58:15.770388805 +0100
***************
*** 744,745 ****
--- 744,747 ----
  {   /* Add new patch number below this line */
+ /**/
+     2384,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
178. You look for an icon to double-click to open your bedroom window.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///