X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/ef44c9e7fc839bec7bb17f8264442912f38c903c..edffbe1c16e39301b91972037ecc6f0b1359d311:/indent/markdown.vim?ds=inline

diff --git a/indent/markdown.vim b/indent/markdown.vim
index fb8d95d..b38a37c 100755
--- a/indent/markdown.vim
+++ b/indent/markdown.vim
@@ -5,9 +5,24 @@ setlocal indentexpr=GetMarkdownIndent()
 setlocal nolisp
 setlocal autoindent
 
+" Automatically insert bullets
+setlocal formatoptions+=r
+" Do not automatically insert bullets when auto-wrapping with text-width
+setlocal formatoptions-=c
+" Accept various markers as bullets
+setlocal comments=b:*,b:+,b:-
+
+" Automatically continue blockquote on line break
+setlocal comments+=b:>
+
 " Only define the function once
 if exists("*GetMarkdownIndent") | finish | endif
 
+function! s:is_mkdCode(lnum)
+    let name = synIDattr(synID(a:lnum, 1, 0), 'name')
+    return (name =~ '^mkd\%(Code$\|Snippet\)' || name != '' && name !~ '^\%(mkd\|html\)')
+endfunction
+
 function! s:is_li_start(line)
     return a:line !~ '^ *\([*-]\)\%( *\1\)\{2}\%( \|\1\)*$' &&
       \    a:line =~ '^\s*[*+-] \+'
@@ -26,6 +41,9 @@ function! s:prevnonblank(lnum)
 endfunction
 
 function GetMarkdownIndent()
+    if v:lnum > 2 && s:is_blank_line(getline(v:lnum - 1)) && s:is_blank_line(getline(v:lnum - 2))
+        return 0
+    endif
     let list_ind = 4
     " Find a non-blank line above the current line.
     let lnum = prevnonblank(v:lnum - 1)
@@ -38,8 +56,12 @@ function GetMarkdownIndent()
         " Current line is the first line of a list item, do not change indent
         return indent(v:lnum)
     elseif s:is_li_start(line)
-        " Last line is the first line of a list item, increase indent
-        return ind + list_ind
+        if s:is_mkdCode(lnum)
+            return ind
+        else
+            " Last line is the first line of a list item, increase indent
+            return ind + list_ind
+        end
     else
         return ind
     endif