Mercurial > vim
changeset 4427:0a94ac379769 v7.3.962
updated for version 7.3.962
Problem: Python tests are not portable.
Solution: Use shiftwidth instead of iminsert. (ZyX)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Fri, 17 May 2013 13:38:04 +0200 |
| parents | 5d8cf5395b4d |
| children | f1ecf16fe9fc |
| files | src/testdir/test86.in src/testdir/test86.ok src/testdir/test87.in src/testdir/test87.ok src/version.c |
| diffstat | 5 files changed, 23 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test86.in +++ b/src/testdir/test86.in @@ -354,7 +354,7 @@ EOF :" colorcolumn: string, window-local :" statusline: string, window-local/global :" autoindent: boolean, buffer-local -:" iminsert: number, buffer-local +:" shiftwidth: number, buffer-local :" omnifunc: string, buffer-local :" preserveindent: boolean, buffer-local/global :" path: string, buffer-local/global @@ -411,7 +411,7 @@ EOF :let lst+=[['colorcolumn', '+1', '+2', '+3', 'abc', 0, 0, 1 ]] :let lst+=[['statusline', '1', '2', '4', 0, 0, 1, 1 ]] :let lst+=[['autoindent', 0, 1, 1, 2, 1, 0, 2 ]] -:let lst+=[['iminsert', 0, 2, 1, 3, 0, 0, 2 ]] +:let lst+=[['shiftwidth', 0, 2, 1, 3, 0, 0, 2 ]] :let lst+=[['omnifunc', 'A', 'B', 'C', 1, 0, 0, 2 ]] :let lst+=[['preserveindent', 0, 1, 1, 2, 1, 1, 2 ]] :let lst+=[['path', '.,,', ',,', '.', 0, 0, 1, 2 ]]
--- a/src/testdir/test86.ok +++ b/src/testdir/test86.ok @@ -232,7 +232,7 @@ jkl G: 0 W: 1:0 2:1 3:0 4:1 B: 1:0 2:1 3:0 4:1 ->>> iminsert +>>> shiftwidth p/gopts1! KeyError inv: 3! KeyError gopts1! KeyError @@ -241,15 +241,15 @@ jkl wopts1! KeyError wopts2! KeyError wopts3! KeyError - p/bopts1: 2 - G: 1 - W: 1:0 2:2 3:2 4:1 - B: 1:0 2:2 3:2 4:1 + p/bopts1: 8 + G: 8 + W: 1:0 2:2 3:8 4:1 + B: 1:0 2:2 3:8 4:1 del wopts3! KeyError del bopts3! ValueError - G: 1 - W: 1:0 2:2 3:2 4:1 - B: 1:0 2:2 3:2 4:1 + G: 8 + W: 1:0 2:2 3:8 4:1 + B: 1:0 2:2 3:8 4:1 >>> omnifunc p/gopts1! KeyError inv: 1! KeyError @@ -333,7 +333,7 @@ Number of tabs: 4 Current tab pages: <tabpage 0>(1): 1 windows, current is <window object (unknown)> Windows: - <window object (unknown)>(0): displays buffer <buffer test86.in>; cursor is at (954, 0) + <window object (unknown)>(0): displays buffer <buffer test86.in>; cursor is at (955, 0) <tabpage 1>(2): 1 windows, current is <window object (unknown)> Windows: <window object (unknown)>(0): displays buffer <buffer 0>; cursor is at (1, 0)
--- a/src/testdir/test87.in +++ b/src/testdir/test87.in @@ -341,7 +341,7 @@ EOF :" colorcolumn: string, window-local :" statusline: string, window-local/global :" autoindent: boolean, buffer-local -:" iminsert: number, buffer-local +:" shiftwidth: number, buffer-local :" omnifunc: string, buffer-local :" preserveindent: boolean, buffer-local/global :" path: string, buffer-local/global @@ -398,7 +398,7 @@ EOF :let lst+=[['colorcolumn', '+1', '+2', '+3', 'abc', 0, 0, 1 ]] :let lst+=[['statusline', '1', '2', '4', 0, 0, 1, 1 ]] :let lst+=[['autoindent', 0, 1, 1, 2, 1, 0, 2 ]] -:let lst+=[['iminsert', 0, 2, 1, 3, 0, 0, 2 ]] +:let lst+=[['shiftwidth', 0, 2, 1, 3, 0, 0, 2 ]] :let lst+=[['omnifunc', 'A', 'B', 'C', 1, 0, 0, 2 ]] :let lst+=[['preserveindent', 0, 1, 1, 2, 1, 1, 2 ]] :let lst+=[['path', '.,,', ',,', '.', 0, 0, 1, 2 ]]
--- a/src/testdir/test87.ok +++ b/src/testdir/test87.ok @@ -221,7 +221,7 @@ jkl G: 0 W: 1:0 2:1 3:0 4:1 B: 1:0 2:1 3:0 4:1 ->>> iminsert +>>> shiftwidth p/gopts1! KeyError inv: 3! KeyError gopts1! KeyError @@ -230,15 +230,15 @@ jkl wopts1! KeyError wopts2! KeyError wopts3! KeyError - p/bopts1: 2 - G: 1 - W: 1:0 2:2 3:2 4:1 - B: 1:0 2:2 3:2 4:1 + p/bopts1: 8 + G: 8 + W: 1:0 2:2 3:8 4:1 + B: 1:0 2:2 3:8 4:1 del wopts3! KeyError del bopts3! ValueError - G: 1 - W: 1:0 2:2 3:2 4:1 - B: 1:0 2:2 3:2 4:1 + G: 8 + W: 1:0 2:2 3:8 4:1 + B: 1:0 2:2 3:8 4:1 >>> omnifunc p/gopts1! KeyError inv: 1! KeyError