Merge branch 'master' of git://github.com/plasticboy/vim-markdown into mappings

diff --git a/README.md b/README.md
index 550707fbedc55b6488caa477b331480520cd0cde..175d3a4dc56bd5120cae381a5494f1404714694d 100644 (file)
--- a/README.md
+++ b/README.md
@@ -26,6 +26,16 @@ Add the following line to your `.vimrc` to disable folding.
 let g:vim_markdown_folding_disabled=1
 ```
 
+**Set Initial Foldlevel**
+
+Add the following line to your `.vimrc` to set the initial foldlevel.  This
+option defaults to 0 (i.e. all folds are closed) and is ignored if folding
+is disabled.
+
+```vim
+let g:vim_markdown_initial_foldlevel=1
+```
+
 ## Mappings
 
 the following work on normal and visual modes:

diff --git a/after/ftplugin/mkd.vim b/after/ftplugin/mkd.vim
index ed78895f5cedb9a6f2add4566e86eb5960cc98b6..26ccb23b885f4b37ccdf76597927970b58a6c2ca 100644 (file)
--- a/after/ftplugin/mkd.vim
+++ b/after/ftplugin/mkd.vim
@@ -40,11 +40,16 @@ if !exists("g:vim_markdown_folding_disabled")
   setlocal foldexpr=Foldexpr_markdown(v:lnum)
   setlocal foldmethod=expr
 
+  " allow the initial foldlevel to be configured in .vimrc
+  if !exists("g:vim_markdown_initial_foldlevel")
+    let g:vim_markdown_initial_foldlevel=0
+  endif
+  let &l:foldlevel=g:vim_markdown_initial_foldlevel
+
   "---------- everything after this is optional -----------------------
   " change the following fold options to your liking
   " see ':help fold-options' for more
   setlocal foldenable
-  setlocal foldlevel=0
   setlocal foldcolumn=0
   set foldmethod=expr
   set foldopen-=search

diff --git a/syntax/mkd.vim b/syntax/mkd.vim
index 20b1d3a22e6f17d9eb48f3470c2d36ff86c854f0..575466be58fee41f64e46203fd369881ab97e457 100644 (file)
--- a/syntax/mkd.vim
+++ b/syntax/mkd.vim
@@ -70,9 +70,11 @@ syn region mkdCode         start=/^```\s*\w*\s*$/          end=/^```\s*$/
 syn region mkdCode         start="<pre[^>]*>"              end="</pre>"
 syn region mkdCode         start="<code[^>]*>"             end="</code>"
 syn region mkdFootnote     start="\[^"                     end="\]"
-syn match  mkdCode         /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/
+syn match  mkdCode         /^\s*\n\(\(\s\{8,}[^ ]\|\t\t\+[^\t]\).*\n\)\+/
+syn match  mkdIndentCode   /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/ contained
 syn match  mkdListItem     "^\s*[-*+]\s\+"
 syn match  mkdListItem     "^\s*\d\+\.\s\+"
+syn region mkdNonListItemBlock start="\n\(\_^\_$\|\s\{4,}[^ ]\|\t+[^\t]\)\@!" end="^\(\s*\([-*+]\|\d\+\.\)\s\+\)\@=" contains=@mkdNonListItem
 syn match  mkdRule         /^\s*\*\s\{0,1}\*\s\{0,1}\*$/
 syn match  mkdRule         /^\s*-\s\{0,1}-\s\{0,1}-$/
 syn match  mkdRule         /^\s*_\s\{0,1}_\s\{0,1}_$/
@@ -89,9 +91,12 @@ syn region htmlH6       start="^\s*######"              end="\($\|#\+\)" contain
 syn match  htmlH1       /^.\+\n=\+$/ contains=@Spell
 syn match  htmlH2       /^.\+\n-\+$/ contains=@Spell
 
+syn cluster mkdNonListItem contains=htmlItalic,htmlBold,htmlBoldItalic,mkdFootnotes,mkdID,mkdURL,mkdLink,mkdLinkDef,mkdLineBreak,mkdBlockquote,mkdCode,mkdIndentCode,mkdListItem,mkdRule,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6
+
 "highlighting for Markdown groups
 HtmlHiLink mkdString       String
 HtmlHiLink mkdCode          String
+HtmlHiLink mkdIndentCode    String
 HtmlHiLink mkdFootnote    Comment
 HtmlHiLink mkdBlockquote    Comment
 HtmlHiLink mkdLineContinue  Comment
@@ -109,6 +114,11 @@ HtmlHiLink mkdLinkTitle     htmlString
 
 HtmlHiLink mkdDelimiter     Delimiter
 
+" Automatically insert bullets
+setlocal formatoptions+=r
+" Accept various markers as bullets
+setlocal comments=b:*,b:+,b:-
+
 let b:current_syntax = "mkd"
 
 delcommand HtmlHiLink