X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/8d87647ce346aa2d356682589c6d43c92b5e55a6..a7617bc1e8fed5d7da31c9cba6d7075ad5f22493:/indent/python.vim

diff --git a/indent/python.vim b/indent/python.vim
index 9c93c60..69ce187 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -15,7 +15,7 @@ let b:did_indent = 1
 setlocal expandtab
 setlocal nolisp
 setlocal autoindent
-setlocal indentexpr=GetPythonIndent(v:lnum)
+setlocal indentexpr=GetPythonPEPIndent(v:lnum)
 setlocal indentkeys=!^F,o,O,<:>,0),0],0},=elif,=except
 
 let s:maxoff = 50
@@ -101,7 +101,7 @@ function! s:BlockStarter(lnum, block_start_re)
     return -1
 endfunction
 
-function! GetPythonIndent(lnum)
+function! GetPythonPEPIndent(lnum)
 
     " First line has indent 0
     if a:lnum == 1
@@ -160,21 +160,23 @@ function! GetPythonIndent(lnum)
         return -1
     endif
 
-    " If this line is explicitly joined, try to find an indentation that looks
-    " good.
+    " If this line is explicitly joined, find the first indentation that is a
+    " multiple of four and will distinguish itself from next logical line.
     if pline =~ '\\$'
-        let compound_statement = '^\s*\(if\|while\|for\s.*\sin\|except\)\s*'
-        let maybe_indent = matchend(getline(sslnum), compound_statement)
-        if maybe_indent != -1
-            return maybe_indent
+        let maybe_indent = indent(sslnum) + &sw
+        let control_structure = '^\s*\(if\|while\|for\s.*\sin\|except\)\s*'
+        if match(getline(sslnum), control_structure) != -1
+            " add extra indent to avoid E125
+            return maybe_indent + &sw
         else
-            return indent(sslnum) + &sw * 2
+            " control structure not found
+            return maybe_indent 
         endif
     endif
 
     " If the previous line ended with a colon and is not a comment, indent
     " relative to statement start.
-    if pline =~ ':\s*$' && pline !~ '^\s*#'
+    if pline =~ '^[^#]*:\s*\(#.*\)\?$'
         return indent(sslnum) + &sw
     endif