spec/make-coverage: do not `cat` profile files (#123)

[etc/vim.git] / indent / python.vim

diff --git a/indent/python.vim b/indent/python.vim
index b5ea8a994eb3661953473b1a7203e2e86e51a77b..5da97e92fb590cfd8be21b85031348c96a174d9b 100644 (file)
--- 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
@@ -330,7 +324,7 @@ function! s:indent_like_previous_line(lnum)
         return -1
     endif
 
-    if !empty && s:is_dedented_already(current, base)
+    if (current || !empty) && s:is_dedented_already(current, base)
         return -1
     endif