Patch 7.4.1962
Problem: Two test files for increment/decrement.
Solution: Move the old style test into the new style test. (Hirohito
Higashi, closes #881)
Files: src/Makefile, src/testdir/Make_all.mak, src/testdir/main.aap,
src/testdir/test35.in, src/testdir/test35.ok,
src/testdir/test_increment.vim
*** ../vim-7.4.1961/src/Makefile 2016-06-26 18:37:51.890998592 +0200
--- src/Makefile 2016-06-26 19:33:16.348139290 +0200
***************
*** 1996,2002 ****
test2 test3 test4 test5 test6 test7 test8 test9 \
test11 test12 test13 test14 test15 test16 test17 test18 test19 \
test20 test21 test22 test23 test24 test25 test26 test27 test28 test29 \
! test30 test31 test32 test33 test34 test35 test36 test37 test38 test39 \
test40 test41 test42 test43 test44 test45 test46 test47 test48 test49 \
test50 test51 test52 test53 test54 test55 test56 test57 test58 test59 \
test60 test61 test62 test63 test64 test65 test66 test67 test68 test69 \
--- 1996,2002 ----
test2 test3 test4 test5 test6 test7 test8 test9 \
test11 test12 test13 test14 test15 test16 test17 test18 test19 \
test20 test21 test22 test23 test24 test25 test26 test27 test28 test29 \
! test30 test31 test32 test33 test34 test36 test37 test38 test39 \
test40 test41 test42 test43 test44 test45 test46 test47 test48 test49 \
test50 test51 test52 test53 test54 test55 test56 test57 test58 test59 \
test60 test61 test62 test63 test64 test65 test66 test67 test68 test69 \
*** ../vim-7.4.1961/src/testdir/Make_all.mak 2016-06-26 16:24:01.285129401
+0200
--- src/testdir/Make_all.mak 2016-06-26 19:33:16.348139290 +0200
***************
*** 32,38 ****
test31.out \
test33.out \
test34.out \
- test35.out \
test36.out \
test37.out \
test38.out \
--- 32,37 ----
*** ../vim-7.4.1961/src/testdir/main.aap 2016-03-19 22:53:54.229469402
+0100
--- src/testdir/main.aap 2016-06-26 19:33:16.348139290 +0200
***************
*** 10,16 ****
test18.out test19.out test20.out test21.out test22.out
test23.out test24.out test25.out test26.out test27.out
test28.out test29.out test30.out test31.out test32.out
! test33.out test34.out test35.out test36.out test37.out
test38.out test39.out test40.out test41.out test42.out
test43.out test44.out test45.out test46.out test47.out
test48.out test49.out test74.out
--- 10,16 ----
test18.out test19.out test20.out test21.out test22.out
test23.out test24.out test25.out test26.out test27.out
test28.out test29.out test30.out test31.out test32.out
! test33.out test34.out test36.out test37.out
test38.out test39.out test40.out test41.out test42.out
test43.out test44.out test45.out test46.out test47.out
test48.out test49.out test74.out
*** ../vim-7.4.1961/src/testdir/test35.in 2010-05-15 13:04:10.000000000
+0200
--- src/testdir/test35.in 1970-01-01 01:00:00.000000000 +0100
***************
*** 1,21 ****
- Test Ctrl-A and Ctrl-X, which increment and decrement decimal, hexadecimal,
- and octal numbers.
-
- STARTTEST
- /^start-here
- :set nrformats=octal,hex
- j 102 l l 64 128 $
- :set nrformats=octal
- 0 102 l 2 w65 129 blx6lD
- :set nrformats=hex
- 0101 l257 Txldt
- :set nrformats=
- 0200 l100 w78 k
- :$-3,$wq! test.out
- ENDTEST
-
- start-here
- 100 0x100 077 0
- 100 0x100 077
- 100 0x100 077 0xfF 0xFf
- 100 0x100 077
--- 0 ----
*** ../vim-7.4.1961/src/testdir/test35.ok 2010-05-15 13:04:10.000000000
+0200
--- src/testdir/test35.ok 1970-01-01 01:00:00.000000000 +0100
***************
*** 1,4 ****
- 0 0x0ff 0000 -1
- 0 1x100 0777777
- -1 0x0 078 0xFE 0xfe
- -100 -100x100 000
--- 0 ----
*** ../vim-7.4.1961/src/testdir/test_increment.vim 2016-03-21
23:13:28.432710474 +0100
--- src/testdir/test_increment.vim 2016-06-26 19:33:16.348139290 +0200
***************
*** 735,739 ****
--- 735,760 ----
call assert_equal([0, 2, 4, 0], getpos('.'))
endfunc
+ " The test35 unified to this file.
+ func Test_normal_increment_03()
+ call setline(1, ["100 0x100 077 0",
+ \ "100 0x100 077 ",
+ \ "100 0x100 077 0xfF 0xFf",
+ \ "100 0x100 077 "])
+ set nrformats=octal,hex
+ exec "norm! gg\<C-A>102\<C-X>\<C-A>l\<C-X>l\<C-A>64\<C-A>128\<C-X>$\<C-X>"
+ set nrformats=octal
+ exec "norm! j0\<C-A>102\<C-X>\<C-A>l\<C-X>2\<C-A>w65\<C-A>129\<C-X>blx6lD"
+ set nrformats=hex
+ exec "norm! j0101\<C-X>l257\<C-X>\<C-A>Txldt \<C-A> \<C-X> \<C-X>"
+ set nrformats=
+ exec "norm! j0200\<C-X>l100\<C-X>w78\<C-X>\<C-A>k"
+ call assert_equal(["0 0x0ff 0000 -1",
+ \ "0 1x100 0777777",
+ \ "-1 0x0 078 0xFE 0xfe",
+ \ "-100 -100x100 000 "], getline(1, '$'))
+ call assert_equal([0, 3, 25, 0], getpos('.'))
+ endfunc
+
" vim: tabstop=2 shiftwidth=2 expandtab
*** ../vim-7.4.1961/src/version.c 2016-06-26 18:37:51.890998592 +0200
--- src/version.c 2016-06-26 19:34:49.834484114 +0200
***************
*** 755,756 ****
--- 755,758 ----
{ /* Add new patch number below this line */
+ /**/
+ 1962,
/**/
--
hundred-and-one symptoms of being an internet addict:
141. You'd rather go to http://www.weather.com/ than look out your window.
/// Bram Moolenaar -- [email protected] -- 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 ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
