aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-05 05:34:07 -04:00
Code Activity

updated for version 7.3.962

Browse Source 
Problem:    Python tests are not portable.
Solution:   Use shiftwidth instead of iminsert. (ZyX)
This commit is contained in:
Bram Moolenaar
2013-05-17 13:38:04 +02:00
parent c24c1acd82
commit 55b8ad3dab
5 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/testdir/test86.in
View File

@@ -354,7 +354,7 @@ EOF
:" colorcolumn: string, window-local :" colorcolumn: string, window-local
:" statusline: string, window-local/global :" statusline: string, window-local/global
:" autoindent: boolean, buffer-local :" autoindent: boolean, buffer-local
:" iminsert: number, buffer-local :" shiftwidth: number, buffer-local
:" omnifunc: string, buffer-local :" omnifunc: string, buffer-local
:" preserveindent: boolean, buffer-local/global :" preserveindent: boolean, buffer-local/global
:" path: string, 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+=[['colorcolumn', '+1', '+2', '+3', 'abc', 0, 0, 1 ]]
:let lst+=[['statusline', '1', '2', '4', 0, 0, 1, 1 ]] :let lst+=[['statusline', '1', '2', '4', 0, 0, 1, 1 ]]
:let lst+=[['autoindent', 0, 1, 1, 2, 1, 0, 2 ]] :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+=[['omnifunc', 'A', 'B', 'C', 1, 0, 0, 2 ]]
:let lst+=[['preserveindent', 0, 1, 1, 2, 1, 1, 2 ]] :let lst+=[['preserveindent', 0, 1, 1, 2, 1, 1, 2 ]]
:let lst+=[['path', '.,,', ',,', '.', 0, 0, 1, 2 ]] :let lst+=[['path', '.,,', ',,', '.', 0, 0, 1, 2 ]]

18
src/testdir/test86.ok
View File

@@ -232,7 +232,7 @@ jkl
G: 0 G: 0
W: 1:0 2:1 3:0 4:1 W: 1:0 2:1 3:0 4:1
B: 1:0 2:1 3:0 4:1 B: 1:0 2:1 3:0 4:1
>>> iminsert >>> shiftwidth
p/gopts1! KeyError p/gopts1! KeyError
inv: 3! KeyError inv: 3! KeyError
gopts1! KeyError gopts1! KeyError
@@ -241,15 +241,15 @@ jkl
wopts1! KeyError wopts1! KeyError
wopts2! KeyError wopts2! KeyError
wopts3! KeyError wopts3! KeyError
p/bopts1: 2 p/bopts1: 8
G: 1 G: 8
W: 1:0 2:2 3:2 4:1 W: 1:0 2:2 3:8 4:1
B: 1:0 2:2 3:2 4:1 B: 1:0 2:2 3:8 4:1
del wopts3! KeyError del wopts3! KeyError
del bopts3! ValueError del bopts3! ValueError
G: 1 G: 8
W: 1:0 2:2 3:2 4:1 W: 1:0 2:2 3:8 4:1
B: 1:0 2:2 3:2 4:1 B: 1:0 2:2 3:8 4:1
>>> omnifunc >>> omnifunc
p/gopts1! KeyError p/gopts1! KeyError
inv: 1! KeyError inv: 1! KeyError
@@ -333,7 +333,7 @@ Number of tabs: 4
Current tab pages: Current tab pages:
<tabpage 0>(1): 1 windows, current is <window object (unknown)> <tabpage 0>(1): 1 windows, current is <window object (unknown)>
Windows: 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)> <tabpage 1>(2): 1 windows, current is <window object (unknown)>
Windows: Windows:
<window object (unknown)>(0): displays buffer <buffer 0>; cursor is at (1, 0) <window object (unknown)>(0): displays buffer <buffer 0>; cursor is at (1, 0)

4
src/testdir/test87.in
View File

@@ -341,7 +341,7 @@ EOF
:" colorcolumn: string, window-local :" colorcolumn: string, window-local
:" statusline: string, window-local/global :" statusline: string, window-local/global
:" autoindent: boolean, buffer-local :" autoindent: boolean, buffer-local
:" iminsert: number, buffer-local :" shiftwidth: number, buffer-local
:" omnifunc: string, buffer-local :" omnifunc: string, buffer-local
:" preserveindent: boolean, buffer-local/global :" preserveindent: boolean, buffer-local/global
:" path: string, 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+=[['colorcolumn', '+1', '+2', '+3', 'abc', 0, 0, 1 ]]
:let lst+=[['statusline', '1', '2', '4', 0, 0, 1, 1 ]] :let lst+=[['statusline', '1', '2', '4', 0, 0, 1, 1 ]]
:let lst+=[['autoindent', 0, 1, 1, 2, 1, 0, 2 ]] :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+=[['omnifunc', 'A', 'B', 'C', 1, 0, 0, 2 ]]
:let lst+=[['preserveindent', 0, 1, 1, 2, 1, 1, 2 ]] :let lst+=[['preserveindent', 0, 1, 1, 2, 1, 1, 2 ]]
:let lst+=[['path', '.,,', ',,', '.', 0, 0, 1, 2 ]] :let lst+=[['path', '.,,', ',,', '.', 0, 0, 1, 2 ]]

16
src/testdir/test87.ok
View File

@@ -221,7 +221,7 @@ jkl
G: 0 G: 0
W: 1:0 2:1 3:0 4:1 W: 1:0 2:1 3:0 4:1
B: 1:0 2:1 3:0 4:1 B: 1:0 2:1 3:0 4:1
>>> iminsert >>> shiftwidth
p/gopts1! KeyError p/gopts1! KeyError
inv: 3! KeyError inv: 3! KeyError
gopts1! KeyError gopts1! KeyError
@@ -230,15 +230,15 @@ jkl
wopts1! KeyError wopts1! KeyError
wopts2! KeyError wopts2! KeyError
wopts3! KeyError wopts3! KeyError
p/bopts1: 2 p/bopts1: 8
G: 1 G: 8
W: 1:0 2:2 3:2 4:1 W: 1:0 2:2 3:8 4:1
B: 1:0 2:2 3:2 4:1 B: 1:0 2:2 3:8 4:1
del wopts3! KeyError del wopts3! KeyError
del bopts3! ValueError del bopts3! ValueError
G: 1 G: 8
W: 1:0 2:2 3:2 4:1 W: 1:0 2:2 3:8 4:1
B: 1:0 2:2 3:2 4:1 B: 1:0 2:2 3:8 4:1
>>> omnifunc >>> omnifunc
p/gopts1! KeyError p/gopts1! KeyError
inv: 1! KeyError inv: 1! KeyError

2
src/version.c
View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
962,
/**/ /**/
961, 961,
/**/ /**/