diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-01-23 14:24:41 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-01-23 14:24:41 +0100 |
| commit | 8d04317104f7ab39785aa9451c6810ef22fcec76 (patch) | |
| tree | 7bff2ef9af3dae8ef12177c43eb397e596fadc9e /runtime/ftplugin/cobol.vim | |
| parent | ac8400d48354a62b7b761cf6897641876d2c476d (diff) | |
Updated runtime files.
Diffstat (limited to 'runtime/ftplugin/cobol.vim')
| -rw-r--r-- | runtime/ftplugin/cobol.vim | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/runtime/ftplugin/cobol.vim b/runtime/ftplugin/cobol.vim index 203d734750..11ad3ad727 100644 --- a/runtime/ftplugin/cobol.vim +++ b/runtime/ftplugin/cobol.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: cobol " Author: Tim Pope <vimNOSPAM@tpope.info> -" $Id: cobol.vim,v 1.1 2007/05/05 17:24:38 vimboss Exp $ +" Last Update: By ZyX: use shiftwidth() " Insert mode mappings: <C-T> <C-D> <Tab> " Normal mode mappings: < > << >> [[ ]] [] ][ @@ -113,7 +113,7 @@ endfunction function! s:increase(...) let lnum = '.' - let sw = &shiftwidth + let sw = shiftwidth() let i = a:0 ? a:1 : indent(lnum) if i >= 11 return sw - (i - 11) % sw @@ -128,7 +128,7 @@ endfunction function! s:decrease(...) let lnum = '.' - let sw = &shiftwidth + let sw = shiftwidth() let i = indent(a:0 ? a:1 : lnum) if i >= 11 + sw return 1 + (i + 12) % sw @@ -147,7 +147,7 @@ function! CobolIndentBlock(shift) let head = strpart(getline('.'),0,7) let tail = strpart(getline('.'),7) let indent = match(tail,'[^ ]') - let sw = &shiftwidth + let sw = shiftwidth() let shift = a:shift if shift > 0 if indent < 4 @@ -221,7 +221,8 @@ endfunction function! s:Tab() if (strpart(getline('.'),0,col('.')-1) =~ '^\s*$' && &sta) return s:IncreaseIndent() - elseif &sts == &sw && &sts != 8 && &et + " &softtabstop < 0: &softtabstop follows &shiftwidth + elseif (&sts < 0 || &sts == shiftwidth()) && &sts != 8 && &et return s:repeat(" ",s:increase(col('.')-1)) else return "\<Tab>" |