From: Hynek Schlawack Date: Tue, 3 Mar 2015 11:12:28 +0000 (+0100) Subject: Merge pull request #39 from blueyed/fix-indent X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/e66de53b9e4c58e6d950b8dce8a0c32703bedb81?ds=sidebyside;hp=-c Merge pull request #39 from blueyed/fix-indent minor style: fix indenting for multiline statement --- e66de53b9e4c58e6d950b8dce8a0c32703bedb81 diff --combined indent/python.vim index 026a056,e8f484b..4dd4c67 --- a/indent/python.vim +++ b/indent/python.vim @@@ -34,24 -34,23 +34,24 @@@ setlocal shiftwidth= let s:maxoff = 50 let s:block_rules = { - \ '^\s*elif\>': ['if', 'elif'], - \ '^\s*else\>': ['if', 'elif', 'for', 'try', 'except'], - \ '^\s*except\>': ['try', 'except'], - \ '^\s*finally\>': ['try', 'except', 'else'] - \ } + \ '^\s*elif\>': ['if', 'elif'], + \ '^\s*else\>': ['if', 'elif', 'for', 'try', 'except'], + \ '^\s*except\>': ['try', 'except'], + \ '^\s*finally\>': ['try', 'except', 'else'] + \ } let s:paren_pairs = ['()', '{}', '[]'] let s:control_statement = '^\s*\(if\|while\|with\|for\|except\)\>' let s:stop_statement = '^\s*\(break\|continue\|raise\|return\|pass\)\>' " Skip strings and comments let s:skip_special_chars = 'synIDattr(synID(line("."), col("."), 0), "name") ' . - \ '=~? "string\\|comment"' + \ '=~? "string\\|comment"' let s:skip_search = 'synIDattr(synID(line("."), col("."), 0), "name") ' . - \ '=~? "comment"' + \ '=~? "comment"' -" compatibility with vim patch 7.3.629: 'sw' can be set to -1 to follow 'ts' +" Use 'shiftwidth()' instead of '&sw'. +" (Since Vim patch 7.3.629, 'shiftwidth' can be set to 0 to follow 'tabstop'). if exists('*shiftwidth') function! s:sw() return shiftwidth()