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

Fix indent after list items
authorderis0126 <deris0126@gmail.com>
Sat, 14 Jun 2014 08:47:13 +0000 (17:47 +0900)
committerHiroshi Shirosaki <h.shirosaki@gmail.com>
Mon, 1 Sep 2014 06:20:30 +0000 (15:20 +0900)
1. Fix not only *+- but also \ matched

Need not escape inside [] because backslash codes do not work inside [].
So pattern [\*+-] match also \.

2. Fix not only list but also horizontal are indented

If only space and three '*' or '-' character are in the line,
this line means horizontal item.
If current line is below horizontal item, it need not to indent.
Following example is horizontal item.

---
***
- - -
* * *

And list item must be specified space after [*-+].
Following example is list item.
* foo
- bar
+ baz

But following example is not list item.
*foo
-bar
+baz

Add indent test file for above bugs.

Fix #90

indent/mkd.vim
test/indent.md [new file with mode: 0644]

index a26ac0efdc88829d7ecc24021c42716d75b4a839..21b8397aca60a8d46c926a2d1914733160d4dedb 100755 (executable)
@@ -10,7 +10,8 @@ setlocal autoindent
 if exists("*GetMkdIndent") | finish | endif
 
 function! s:is_li_start(line)
-    return a:line =~ '^\s*[\*+-]'
+    return a:line !~ '^ *\([*-]\)\%( *\1\)\{2}\%( \|\1\)*$' &&
+      \    a:line =~ '^\s*[*+-] \+'
 endfunction
 
 function! s:is_blank_line(line)
diff --git a/test/indent.md b/test/indent.md
new file mode 100644 (file)
index 0000000..6d250a1
--- /dev/null
@@ -0,0 +1,26 @@
+1. Confirm indent with new line insert after list items
+
+'\' is not list item.
+\ foo
+
+If only space and three '*' or '-' character are in the line,
+this line means horizontal item.
+If current line is below horizontal item, it need not to indent.
+Following example is horizontal item.
+
+---
+***
+- - -
+* * *
+
+And list item must be specified space after [*-+].
+Following example is list item.
+
+* foo
+- bar
++ baz
+
+But following example is not list item.
+*foo
+-bar
++baz