Merge remote-tracking branch 'upstream/dev' into 'upstream/tags'

Conflicts:
	autoload/vimwiki/base.vim
This commit is contained in:
Ivan Tishchenko
2015-03-25 21:33:19 +03:00
16 changed files with 228 additions and 158 deletions

View File

@ -1,8 +1,7 @@
" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
" Vimwiki syntax file
" Default syntax
" Author: Maxim Kim <habamax@gmail.com>
" Home: http://code.google.com/p/vimwiki/
" Desc: Defines default syntax
" Home: https://github.com/vimwiki/vimwiki/
" text: $ equation_inline $
let g:vimwiki_rxEqIn = '\$[^$`]\+\$'