Patch 7.4.2228
Problem: Test files have inconsistant modelines.
Solution: Don't set 'tabstop' to 2, use 'sts' and 'sw'.
Files: src/testdir/README.txt, src/testdir/test_backspace_opt.vim,
src/testdir/test_digraph.vim, src/testdir/test_gn.vim,
src/testdir/test_help_tagjump.vim,
src/testdir/test_increment_dbcs.vim,
src/testdir/test_increment.vim, src/testdir/test_match.vim,
src/testdir/test_tagjump.vim, src/testdir/test_window_cmd.vim,
src/testdir/test_regexp_latin.vim, src/testdir/test_timers.vim
*** ../vim-7.4.2227/src/testdir/README.txt 2016-06-04 20:25:01.185991001
+0200
--- src/testdir/README.txt 2016-08-16 17:12:20.043874739 +0200
***************
*** 3,13 ****
If it makes sense, add a new test method to an already existing file. You may
want to separate it from other tests with comment lines.
! The numbered tests are older, we have switched to named tests.
And then you can choose between a new style test, which is a Vim script, or an
old style test, which uses Normal mode commands. Use a new style test if you
! can.
TO ADD A NEW STYLE TEST:
--- 3,14 ----
If it makes sense, add a new test method to an already existing file. You may
want to separate it from other tests with comment lines.
! The numbered tests are older, we have switched to named tests. Don't add any
! more numbered tests.
And then you can choose between a new style test, which is a Vim script, or an
old style test, which uses Normal mode commands. Use a new style test if you
! can. Use an old style test when it needs to run without the +eval feature.
TO ADD A NEW STYLE TEST:
*** ../vim-7.4.2227/src/testdir/test_backspace_opt.vim 2016-03-30
20:50:41.905696041 +0200
--- src/testdir/test_backspace_opt.vim 2016-08-18 22:57:45.706609277 +0200
***************
*** 56,59 ****
set nocompatible viminfo+=nviminfo
endfunc
! " vim: tabstop=2 shiftwidth=0 expandtab
--- 56,59 ----
set nocompatible viminfo+=nviminfo
endfunc
! " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-7.4.2227/src/testdir/test_digraph.vim 2016-07-21
22:02:57.371744932 +0200
--- src/testdir/test_digraph.vim 2016-08-18 21:34:47.323808818 +0200
***************
*** 458,461 ****
call assert_equal("€", s)
endfunc
! " vim: tabstop=2 shiftwidth=0 sts=-1 expandtab
--- 458,461 ----
call assert_equal("€", s)
endfunc
! " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-7.4.2227/src/testdir/test_gn.vim 2016-07-24 17:32:41.881505040
+0200
--- src/testdir/test_gn.vim 2016-08-18 22:59:22.277680950 +0200
***************
*** 90,93 ****
sil! %d _
endfu
! " vim: tabstop=2 shiftwidth=0 expandtab
--- 90,93 ----
sil! %d _
endfu
! " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-7.4.2227/src/testdir/test_help_tagjump.vim 2016-06-04
22:31:23.969886694 +0200
--- src/testdir/test_help_tagjump.vim 2016-08-18 22:59:47.849435390 +0200
***************
*** 150,153 ****
endtry
endfunc
! " vim: et sw=2:
--- 150,153 ----
endtry
endfunc
! " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-7.4.2227/src/testdir/test_increment_dbcs.vim 2016-06-26
16:24:01.285129401 +0200
--- src/testdir/test_increment_dbcs.vim 2016-08-18 23:00:23.285095285 +0200
***************
*** 27,30 ****
call assert_equal([0, 1, 10, 0], getpos('.'))
endfunc
! " vim: shiftwidth=2 expandtab
--- 27,30 ----
call assert_equal([0, 1, 10, 0], getpos('.'))
endfunc
! " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-7.4.2227/src/testdir/test_increment.vim 2016-06-26
19:38:05.787014867 +0200
--- src/testdir/test_increment.vim 2016-08-18 21:35:09.215615628 +0200
***************
*** 757,760 ****
endfunc
! " vim: tabstop=2 shiftwidth=2 expandtab
--- 757,760 ----
endfunc
! " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-7.4.2227/src/testdir/test_match.vim 2016-08-16 16:08:14.612354306
+0200
--- src/testdir/test_match.vim 2016-08-18 21:35:26.855459953 +0200
***************
*** 186,189 ****
set hlsearch&
endfunc
! " vim: et ts=2 sw=2
--- 186,189 ----
set hlsearch&
endfunc
! " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-7.4.2227/src/testdir/test_tagjump.vim 2016-06-04
20:25:01.185991001 +0200
--- src/testdir/test_tagjump.vim 2016-08-18 23:02:16.400010985 +0200
***************
*** 7,10 ****
set tagstack&vim
endfunc
! " vim: sw=2 et
--- 7,10 ----
set tagstack&vim
endfunc
! " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-7.4.2227/src/testdir/test_window_cmd.vim 2016-06-26
17:11:15.655124127 +0200
--- src/testdir/test_window_cmd.vim 2016-08-18 23:02:41.599769702 +0200
***************
*** 67,70 ****
augroup! test_window_cmd_wincmd_gf
endfunc
! " vim: sw=2 et
--- 67,70 ----
augroup! test_window_cmd_wincmd_gf
endfunc
! " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-7.4.2227/src/testdir/test_regexp_latin.vim 2016-08-16
21:04:37.827952367 +0200
--- src/testdir/test_regexp_latin.vim 2016-08-17 20:10:48.666188319 +0200
***************
*** 38,41 ****
call setwinvar(1, 'myvar', 1)
bwipe!
endfunc
-
--- 38,40 ----
*** ../vim-7.4.2227/src/testdir/test_timers.vim 2016-08-08 22:46:10.777100339
+0200
--- src/testdir/test_timers.vim 2016-08-18 21:35:56.035202424 +0200
***************
*** 112,115 ****
call assert_inrange(0, 10, slept)
endfunc
! " vim: ts=2 sw=0 et
--- 112,115 ----
call assert_inrange(0, 10, slept)
endfunc
! " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-7.4.2227/src/version.c 2016-08-18 22:11:27.036228825 +0200
--- src/version.c 2016-08-18 22:56:52.987116724 +0200
***************
*** 765,766 ****
--- 765,768 ----
{ /* Add new patch number below this line */
+ /**/
+ 2228,
/**/
--
To define recursion, we must first define recursion.
/// 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.
