X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/61e1c4d6a5c90ba0222cd58198ccc0232433f90c..84f35c0a4f3fcb8a816785e02983732c4a1dcc99:/indent/python.vim?ds=sidebyside diff --git a/indent/python.vim b/indent/python.vim index 977ec05..5da97e9 100644 --- a/indent/python.vim +++ b/indent/python.vim @@ -95,7 +95,6 @@ else endfunction endif - " Use 'shiftwidth()' instead of '&sw'. " (Since Vim patch 7.3.629, 'shiftwidth' can be set to 0 to follow 'tabstop'). if exists('*shiftwidth') @@ -119,16 +118,11 @@ function! s:find_opening_paren(lnum, col) let nearest = [0, 0] let timeout = g:python_pep8_indent_searchpair_timeout + let skip_special_chars = 's:_skip_special_chars(line("."), col("."))' for [p, maxoff] in items(s:paren_pairs) let stopline = max([0, line('.') - maxoff, nearest[0]]) - let found = 0 - while 1 - let next = searchpairpos('\V'.p[0], '', '\V'.p[1], 'bnW', '', stopline, timeout) - if !next[0] || !s:_skip_special_chars(next[0], next[1]) - break - endif - call cursor(next[0], next[1]) - endwhile + let next = searchpairpos( + \ '\V'.p[0], '', '\V'.p[1], 'bnW', skip_special_chars, stopline, timeout) if next[0] && (next[0] > nearest[0] || (next[0] == nearest[0] && next[1] > nearest[1])) let nearest = next endif