X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/5ff124014066ba7882617c283e7750d449caafb4..6c3e0bc575abd9618070fad8a27f50a41751136f:/indent/markdown.vim?ds=sidebyside

diff --git a/indent/markdown.vim b/indent/markdown.vim
index fb8d95d..3f89b5c 100755
--- a/indent/markdown.vim
+++ b/indent/markdown.vim
@@ -5,9 +5,23 @@ 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)
+    return synIDattr(synID(a:lnum, 1, 0), 'name') == 'mkdCode'
+endfunction
+
 function! s:is_li_start(line)
     return a:line !~ '^ *\([*-]\)\%( *\1\)\{2}\%( \|\1\)*$' &&
       \    a:line =~ '^\s*[*+-] \+'
@@ -38,8 +52,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