Updated submodules, fixed a conflict with diff and markdown and

configured gradle files to use the built-in groovy syntax.
This commit is contained in:
Kevin MacMartin 2014-06-09 02:15:35 -04:00
parent 81fbfcb1a1
commit 2c8b3069e5
4 changed files with 23 additions and 10 deletions

@ -1 +1 @@
Subproject commit 603985a962934aa59bf8dc8944715af512dcac88
Subproject commit 1c1962cd0031616549a703de87c4f488bee4e29e

@ -1 +1 @@
Subproject commit 6d3a4ccfe9f9761846c8ebefd18be923983a429d
Subproject commit ded2b8ebbe24da372c4db20b7a50328ca2f606d4

View file

@ -16,8 +16,6 @@
"SYNTAX PLUGINS: {{{
let g:vim_json_warnings=0
let g:vim_json_syntax_conceal=0
let g:vim_markdown_folding_disabled=0
let g:vim_markdown_initial_foldlevel=2
"}}}
"BREEZE: {{{
@ -57,6 +55,20 @@
autocmd FileType gundo setlocal nocursorcolumn
"}}}
"MARKDOWN: {{{
let g:vim_markdown_folding_disabled=0
let g:vim_markdown_initial_foldlevel=2
"Remove default mappings then set them to fix issues with vimdiff
let g:vim_markdown_no_default_key_mappings=1
nmap ]] <Plug>(Markdown_MoveToNextHeader)
nmap [[ <Plug>(Markdown_MoveToPreviousHeader)
nmap ][ <Plug>(Markdown_MoveToNextSiblingHeader)
nmap [] <Plug>(Markdown_MoveToPreviousSiblingHeader)
nmap ]c <Plug>(Markdown_MoveToCurHeader)
nmap ]u <Plug>(Markdown_MoveToParentHeader)
"}}}
"NEOCOMPLCACHE AUTOCOMPLETION PLUGIN: {{{
let g:neocomplcache_enable_at_startup=1
let g:neocomplcache_enable_smart_case=1

View file

@ -67,12 +67,13 @@
filetype plugin indent on
syntax on
"set matching filenames to matching filenames
autocmd BufNewFile,BufRead *.aspx,*.asmx,*.ascx,*.master setf aspnet
autocmd BufNewFile,BufRead *.muttrc setf muttrc
autocmd BufNewFile,BufRead pacman.conf,yaourtrc setf sh
autocmd BufNewFile,BufRead archversion.conf setf archversion
autocmd BufNewFile,BufRead cjdroute.conf,cjdmaid.conf setf json
"set given filenames to various filetypes
au BufNewFile,BufRead *.aspx,*.asmx,*.ascx,*.master setf aspnet
au BufNewFile,BufRead *.gradle setf groovy
au BufNewFile,BufRead *.muttrc setf muttrc
au BufNewFile,BufRead pacman.conf,yaourtrc setf sh
au BufNewFile,BufRead archversion.conf setf archversion
au BufNewFile,BufRead cjdroute.conf,cjdmaid.conf setf json
"}}}
"GVIM: GUI CONFIG OPTIONS {{{