Squashed '.vim/bundle/vim-markdown/' changes from da5a7ac9..8f6cb3a6

[etc/vim.git] / indent / markdown.vim

diff --git a/indent/markdown.vim b/indent/markdown.vim
index 540bc044e1763a6a73e69eca7742bdd9af9210cf..a954c92346146cb7067a23440d827d0227eb40d7 100755 (executable)
--- a/indent/markdown.vim
+++ b/indent/markdown.vim
@@ -1,35 +1,39 @@
-if exists("b:did_indent") | finish | endif
+if exists('b:did_indent') | finish | endif

 let b:did_indent = 1
 
 setlocal indentexpr=GetMarkdownIndent()
 setlocal nolisp
 setlocal autoindent
 
 let b:did_indent = 1
 
 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
 " Automatically continue blockquote on line break

-setlocal comments+=b:>
+setlocal formatoptions+=r
+setlocal comments=b:>
+if get(g:, 'vim_markdown_auto_insert_bullets', 1)
+    " Do not automatically insert bullets when auto-wrapping with text-width
+    setlocal formatoptions-=c
+    " Accept various markers as bullets
+    setlocal comments+=b:*,b:+,b:-
+endif

 
 " Only define the function once
 
 " Only define the function once

-if exists("*GetMarkdownIndent") | finish | endif
+if exists('*GetMarkdownIndent') | finish | endif

 
 function! s:IsMkdCode(lnum)
     let name = synIDattr(synID(a:lnum, 1, 0), 'name')
 
 function! s:IsMkdCode(lnum)
     let name = synIDattr(synID(a:lnum, 1, 0), 'name')

-    return (name =~ '^mkd\%(Code$\|Snippet\)' || name != '' && name !~ '^\%(mkd\|html\)')
+    return (name =~# '^mkd\%(Code$\|Snippet\)' || name !=# '' && name !~? '^\%(mkd\|html\)')

 endfunction
 
 function! s:IsLiStart(line)
 endfunction
 
 function! s:IsLiStart(line)

-    return a:line !~ '^ *\([*-]\)\%( *\1\)\{2}\%( \|\1\)*$' &&
-      \    a:line =~ '^\s*[*+-] \+'
+    return a:line !~# '^ *\([*-]\)\%( *\1\)\{2}\%( \|\1\)*$' &&
+      \    a:line =~# '^\s*[*+-] \+'
+endfunction
+
+function! s:IsHeaderLine(line)
+    return a:line =~# '^\s*#'

 endfunction
 
 function! s:IsBlankLine(line)
 endfunction
 
 function! s:IsBlankLine(line)

-    return a:line =~ '^$'
+    return a:line =~# '^$'

 endfunction
 
 function! s:PrevNonBlank(lnum)
 endfunction
 
 function! s:PrevNonBlank(lnum)


@@ -44,7 +48,7 @@ function GetMarkdownIndent()
     if v:lnum > 2 && s:IsBlankLine(getline(v:lnum - 1)) && s:IsBlankLine(getline(v:lnum - 2))
         return 0
     endif
     if v:lnum > 2 && s:IsBlankLine(getline(v:lnum - 1)) && s:IsBlankLine(getline(v:lnum - 2))
         return 0
     endif

-    let list_ind = 4
+    let list_ind = get(g:, 'vim_markdown_new_list_item_indent', 4)

     " Find a non-blank line above the current line.
     let lnum = s:PrevNonBlank(v:lnum - 1)
     " At the start of the file use zero indent.
     " Find a non-blank line above the current line.
     let lnum = s:PrevNonBlank(v:lnum - 1)
     " At the start of the file use zero indent.


@@ -55,6 +59,9 @@ function GetMarkdownIndent()
     if s:IsLiStart(cline)
         " Current line is the first line of a list item, do not change indent
         return indent(v:lnum)
     if s:IsLiStart(cline)
         " Current line is the first line of a list item, do not change indent
         return indent(v:lnum)

+    elseif s:IsHeaderLine(cline) && !s:IsMkdCode(v:lnum)
+        " Current line is the header, do not indent
+        return 0

     elseif s:IsLiStart(line)
         if s:IsMkdCode(lnum)
             return ind
     elseif s:IsLiStart(line)
         if s:IsMkdCode(lnum)
             return ind