]> 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:

Merge pull request #4 from ElectronicRU/master
authorHynek Schlawack <hs@ox.cx>
Sun, 20 Jan 2013 11:26:29 +0000 (03:26 -0800)
committerHynek Schlawack <hs@ox.cx>
Sun, 20 Jan 2013 11:26:29 +0000 (03:26 -0800)
Better colon handling

Fix regression that made vim not indent if there was a comment at the end of
a line.

indent/python.vim

index 9c93c602d275932e2dda8556f0e19224e72676f3..1dabb475c043533578dc6eebcee53d4d288f753e 100644 (file)
@@ -174,7 +174,7 @@ function! GetPythonIndent(lnum)
 
     " 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