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

Do not indent after comment line with colon
authorJoseph Irwin <joseph.irwin.gt@gmail.com>
Sat, 18 Aug 2012 04:18:25 +0000 (13:18 +0900)
committerJoseph Irwin <joseph.irwin.gt@gmail.com>
Sat, 18 Aug 2012 04:18:25 +0000 (13:18 +0900)
When checking for a line ending with a colon, this commit adds a
condition to avoid matching comments. A comment line ending with a colon
should not indent a new block.

This changes the current behavior from this::

    \#<some comment>:
        <cursor>

To this::

    \#<some comment>:
    <cursor>

indent/python.vim

index 82f0d7c26ab117a9b20517e6a1a74856253beaf1..9c93c602d275932e2dda8556f0e19224e72676f3 100644 (file)
@@ -172,9 +172,9 @@ function! GetPythonIndent(lnum)
         endif
     endif
 
-    " If the previous line ended with a colon, indent relative to
-    " statement start.
-    if pline =~ ':\s*$'
+    " If the previous line ended with a colon and is not a comment, indent
+    " relative to statement start.
+    if pline =~ ':\s*$' && pline !~ '^\s*#'
         return indent(sslnum) + &sw
     endif