vim
autoload
rainbow.vim +92 -0
rainbow_main.vim +97 -0
plugin
rainbow_main.vim +10 -0
vimrc +131 -46
vimrc.bundles +10 -0
vimrc.local +0 -1
vim/autoload/rainbow.vim
0 → 100644
+ 92
- 0
vim/autoload/rainbow_main.vim
0 → 100644
+ 97
- 0
\ 'parentheses': ['start=/\v\<((area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr)[ >])@!\z([-_:a-zA-Z0-9]+)(\s+[-_:a-zA-Z0-9]+(\=("[^"]*"|'."'".'[^'."'".']*'."'".'|[^ '."'".'"><=`]*))?)*\>/ end=#</\z1># fold', 'start=/(/ end=/)/ containedin=@htmlPreproc contains=@phpClTop', 'start=/\[/ end=/\]/ containedin=@htmlPreproc contains=@phpClTop', 'start=/{/ end=/}/ containedin=@htmlPreproc contains=@phpClTop'],
vim/plugin/rainbow_main.vim
0 → 100644
+ 10
- 0
+ 131
- 46
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -42,12 +24,65 @@ set showcmd
@@ -66,6 +101,7 @@ nnoremap <leader>f :NERDTreeFind<CR>
@@ -73,11 +109,36 @@ noremap <silent> <leader>V :source ~/.vimrc<CR>:filetype detect<CR>:exe ":echo '
@@ -87,21 +148,32 @@ if executable('ag')
@@ -111,6 +183,7 @@ else
@@ -127,3 +200,15 @@ if filereadable(expand("~/.vimrc.local"))
+ 10
- 0
@@ -41,3 +41,13 @@ Plugin 'vim-ruby/vim-ruby'
+ 0
- 1
@@ -17,7 +17,6 @@ if (&t_Co == 256 || has('gui_running'))