Fix regression with colon-at-eol detection (#44)

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

diff --git a/indent/python.vim b/indent/python.vim
index a1dd43fb7511d264dee45ff186d7f5b0fac1a0b1..c3c6c03454ad5d0d3a63f2ae8030c0ec910e9b99 100644 (file)
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -243,17 +243,16 @@ function! s:indent_like_previous_line(lnum)
     let ignore_last_char = eval(s:skip_special_chars)
 
     " Search for final colon that is not inside something to be ignored.
     let ignore_last_char = eval(s:skip_special_chars)
 
     " Search for final colon that is not inside something to be ignored.

-    while search(':', 'bcW', lnum)
+    while 1

         let curpos = getpos(".")[2]
         if curpos == 1 | break | endif
         let curpos = getpos(".")[2]
         if curpos == 1 | break | endif

-        if eval(s:skip_special_chars)
+        if eval(s:skip_special_chars) || text[curpos-1] =~ '\s'

             normal! h
             continue
             normal! h
             continue

-        endif
-        if !s:match_expr_on_line(s:skip_special_chars, lnum, curpos)
+        elseif text[curpos-1] == ':'

             return base + s:sw()
         endif
             return base + s:sw()
         endif

-        normal! h
+        break

     endwhile
 
     if text =~ '\\$' && !ignore_last_char
     endwhile
 
     if text =~ '\\$' && !ignore_last_char