update

vimrc

@@ -41,11 +41,26 @@ augroup END
 
 "}}}
 
+"#html5{{{
+" https://github.com/othree/html5.vim
+Plug 'othree/html5.vim'
+"}}}
+
 " #php.vim{{{
 " https://github.com/StanAngeloff/php.vim
 Plug 'StanAngeloff/php.vim'
 "}}}
 
+"#vim-json{{{
+" https://github.com/elzr/vim-json
+Plug 'elzr/vim-json'
+"}}}
+
+"#i3config.vim{{{
+" https://github.com/mboughaba/i3config.vim
+Plug 'mboughaba/i3config.vim'
+"}}}
+
 " #tagbar {{{
 Plug 'majutsushi/tagbar'
 
@@ -213,8 +228,14 @@ Plug 'shawncplus/phpcomplete.vim'
 "   https://github.com/joseluis/wordpress.vim-generator
 "}}}
 
+" #wordpress.vim{{{
+" doesn't support universal ctags
 " #Plug 'dsawardekar/wordpress.vim'
-" disabled - doesn't support universal ctags?
+" This fork does:
+" https://github.com/DArcMattr/wordpress.vim/tree/universal-ctags
+" Using studio-vx fork
+Plug 'studio-vx/wordpress.vim', { 'branch': 'universal-ctags' }
+"}}}
 
 " #vim-commentary{{{
 " https://github.com/tpope/vim-commentary
@@ -560,7 +581,9 @@ function! MyFoldText() "{{{
 
   let l:linecount = v:foldend - v:foldstart
   " don't display foldmarker braces
-  let l:line = substitute(getline(v:foldstart), '"{{{', '', '')
+  " put one of the braces in brackets so vim doesn't treat
+  " it as an actual fold marker
+  let l:line = substitute(getline(v:foldstart), '"\?{\({\){', '', '')
   " don't display vim comment quotation marks
   let l:line = substitute(l:line, "\^\"\\s\\?", '', '')