Commits

Ben Baker-Smith committed d65fa8a Merge

fix merge conflict

Comments (0)

Files changed (2)

-# Liquid Fold
-### A vim plugin for syntax folding in [Liquid templates](http://liquidmarkup.org/)
+# **liquidfold.vim**
 
-Liquid Fold provides syntax folding for any tags that have an associated end tag, including:
+liquidfold.vim provides syntax folding for [Liquid templates](http://liquidmarkup.org/). It supports any tags that have an associated end tag, including:
 
     {% comment %} {% endcomment %}
     {% raw %} {% endraw %}
 
 ## Installation
 
-Use [pathogen.vim](https://github.com/tpope/vim-pathogen), and clone Liquid Fold into your ~/.vim/bundle directory.
+Use [pathogen.vim](https://github.com/tpope/vim-pathogen), and clone liquidfold.vim into your ~/.vim/bundle directory.
 
     cd ~/.vim/bundle
     git clone git@bitbucket.org:bbakersmith/liquidfold.vim.git
 
 ## Customization
 
-To specify which tags you want to make foldable, set g:liquid_foldwords in your vimrc.
+To specify which tags you want to make foldable, set g:liquidfold_words in your vimrc.
 
-    let g:liquid_foldwords = "block,if"
+    let g:liquidfold_words = "block,if"
 
 
 ## License

plugin/liquidfold.vim

-" set defaults if g:liquid_foldwords hasn't been set in .vimrc
+" set defaults if g:liquidfold_words hasn't been defined in .vimrc
 "
-if !exists('g:liquid_foldwords')
-  let g:liquid_foldwords = "comment,raw,if,case,for,tablerow,block"
+if !exists('g:liquidfold_words')
+  let g:liquidfold_words = "comment,raw,if,case,for,tablerow,block"
 endif
 
 
 " define fold regions using foldwords
 "
 function! MarkLiquidFolds()
-  let foldwords = '\('.join(split(g:liquid_foldwords,","),'\|').'\)'
+  let foldwords = '\('.join(split(g:liquidfold_words,","),'\|').'\)'
   let foldstart = '^.*{%\s\?'.foldwords.'.*%}.*$'
   let foldend = '^.*{%\s\?end'.foldwords.'.*%}.*$' 
   let foldcommand = "syn region LiquidFold start='".foldstart."' end='".foldend."' fold transparent keepend extend"