diff options
Diffstat (limited to 'data/vim/patches/8.1.0327')
| -rw-r--r-- | data/vim/patches/8.1.0327 | 136 |
1 files changed, 136 insertions, 0 deletions
diff --git a/data/vim/patches/8.1.0327 b/data/vim/patches/8.1.0327 new file mode 100644 index 000000000..37cdd65d7 --- /dev/null +++ b/data/vim/patches/8.1.0327 @@ -0,0 +1,136 @@ +To: vim_dev@googlegroups.com +Subject: Patch 8.1.0327 +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.0327 +Problem: The "g CTRL-G" command isn't tested much. +Solution: Add more tests. (Dominique Pelle, closes #3369) +Files: src/testdir/test_normal.vim + + +*** ../vim-8.1.0326/src/testdir/test_normal.vim 2018-05-17 15:43:28.000000000 +0200 +--- src/testdir/test_normal.vim 2018-08-24 21:56:40.272464401 +0200 +*************** +*** 1806,1816 **** + call assert_equal(15, col('.')) + call assert_equal('l', getreg(0)) + +- " Test for g Ctrl-G +- set ff=unix +- let a=execute(":norm! g\<c-g>") +- call assert_match('Col 15 of 43; Line 2 of 2; Word 2 of 2; Byte 16 of 45', a) +- + " Test for gI + norm! gIfoo + call assert_equal(['', 'fooabcdefghijk lmno0123456789AMNOPQRSTUVWXYZ'], getline(1,'$')) +--- 1806,1811 ---- +*************** +*** 1829,1834 **** +--- 1824,1904 ---- + bw! + endfunc + ++ func! Test_g_ctrl_g() ++ new ++ ++ let a = execute(":norm! g\<c-g>") ++ call assert_equal("\n--No lines in buffer--", a) ++ ++ call setline(1, ['first line', 'second line']) ++ ++ " Test g CTRL-g with dos, mac and unix file type. ++ norm! gojll ++ set ff=dos ++ let a = execute(":norm! g\<c-g>") ++ call assert_equal("\nCol 3 of 11; Line 2 of 2; Word 3 of 4; Byte 15 of 25", a) ++ ++ set ff=mac ++ let a = execute(":norm! g\<c-g>") ++ call assert_equal("\nCol 3 of 11; Line 2 of 2; Word 3 of 4; Byte 14 of 23", a) ++ ++ set ff=unix ++ let a = execute(":norm! g\<c-g>") ++ call assert_equal("\nCol 3 of 11; Line 2 of 2; Word 3 of 4; Byte 14 of 23", a) ++ ++ " Test g CTRL-g in visual mode (v) ++ let a = execute(":norm! gojllvlg\<c-g>") ++ call assert_equal("\nSelected 1 of 2 Lines; 1 of 4 Words; 2 of 23 Bytes", a) ++ ++ " Test g CTRL-g in visual mode (CTRL-V) with end col > start col ++ let a = execute(":norm! \<Esc>gojll\<C-V>kllg\<c-g>") ++ call assert_equal("\nSelected 3 Cols; 2 of 2 Lines; 2 of 4 Words; 6 of 23 Bytes", a) ++ ++ " Test g_CTRL-g in visual mode (CTRL-V) with end col < start col ++ let a = execute(":norm! \<Esc>goll\<C-V>jhhg\<c-g>") ++ call assert_equal("\nSelected 3 Cols; 2 of 2 Lines; 2 of 4 Words; 6 of 23 Bytes", a) ++ ++ " Test g CTRL-g in visual mode (CTRL-V) with end_vcol being MAXCOL ++ let a = execute(":norm! \<Esc>gojll\<C-V>k$g\<c-g>") ++ call assert_equal("\nSelected 2 of 2 Lines; 4 of 4 Words; 17 of 23 Bytes", a) ++ ++ " There should be one byte less with noeol ++ set bin noeol ++ let a = execute(":norm! \<Esc>gog\<c-g>") ++ call assert_equal("\nCol 1 of 10; Line 1 of 2; Word 1 of 4; Char 1 of 23; Byte 1 of 22", a) ++ set bin & eol& ++ ++ if has('multi_byte') ++ call setline(1, ['Français', '日本語']) ++ ++ let a = execute(":norm! \<Esc>gojlg\<c-g>") ++ call assert_equal("\nCol 4-3 of 9-6; Line 2 of 2; Word 2 of 2; Char 11 of 13; Byte 16 of 20", a) ++ ++ let a = execute(":norm! \<Esc>gojvlg\<c-g>") ++ call assert_equal("\nSelected 1 of 2 Lines; 1 of 2 Words; 2 of 13 Chars; 6 of 20 Bytes", a) ++ ++ let a = execute(":norm! \<Esc>goll\<c-v>jlg\<c-g>") ++ call assert_equal("\nSelected 4 Cols; 2 of 2 Lines; 2 of 2 Words; 6 of 13 Chars; 11 of 20 Bytes", a) ++ ++ set fenc=utf8 bomb ++ let a = execute(":norm! \<Esc>gojlg\<c-g>") ++ call assert_equal("\nCol 4-3 of 9-6; Line 2 of 2; Word 2 of 2; Char 11 of 13; Byte 16 of 20(+3 for BOM)", a) ++ ++ set fenc=utf16 bomb ++ let a = execute(":norm! g\<c-g>") ++ call assert_equal("\nCol 4-3 of 9-6; Line 2 of 2; Word 2 of 2; Char 11 of 13; Byte 16 of 20(+2 for BOM)", a) ++ ++ set fenc=utf32 bomb ++ let a = execute(":norm! g\<c-g>") ++ call assert_equal("\nCol 4-3 of 9-6; Line 2 of 2; Word 2 of 2; Char 11 of 13; Byte 16 of 20(+4 for BOM)", a) ++ ++ set fenc& bomb& ++ endif ++ ++ set ff& ++ bwipe! ++ endfunc ++ + fun! Test_normal34_g_cmd3() + if !has("multi_byte") + return +*** ../vim-8.1.0326/src/version.c 2018-08-24 21:30:24.818557489 +0200 +--- src/version.c 2018-08-24 21:57:46.239693505 +0200 +*************** +*** 796,797 **** +--- 796,799 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 327, + /**/ + +-- +For large projects, Team Leaders use sophisticated project management software +to keep track of who's doing what. The software collects the lies and guesses +of the project team and organizes them in to instantly outdated charts that +are too boring to look at closely. This is called "planning". + (Scott Adams - The Dilbert principle) + + /// 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 /// |