]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

conform with pep8's preferences on explicit line continuation
authorClay Gerrard <clay.gerrard@gmail.com>
Tue, 17 Sep 2013 02:20:25 +0000 (19:20 -0700)
committerClay Gerrard <clay.gerrard@gmail.com>
Tue, 17 Sep 2013 02:40:46 +0000 (19:40 -0700)
indent/python.vim

index 9c3aa0cda4293d75366cf398f7861d00ffd83cbe..69ce187844d767af9e3fa8954d1ce03d4aec8376 100644 (file)
@@ -160,15 +160,17 @@ function! GetPythonPEPIndent(lnum)
         return -1
     endif
 
         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 =~ '\\$'
     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
         else
-            return indent(sslnum) + &sw * 2
+            " control structure not found
+            return maybe_indent 
         endif
     endif
 
         endif
     endif