X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=9f6fdd001d1a89fe97a3a416f68dd32df20cda53;hp=bd9cfe3f8ff5fe154513dd300dec626bf232a24b;hb=7e03808f1a7b11f00f7b9bc7a0436e0eeaec00d3;hpb=7db1fbf5bd290509aaec6c8e002d6f0a3617aa04

diff --git a/init.vim b/init.vim
index bd9cfe3..9f6fdd0 100644
--- a/init.vim
+++ b/init.vim
@@ -136,11 +136,11 @@ let g:vim_markdown_math=1
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some filetype-specific settings
 
-au FileType text,markdown,mail,tex,gitcommit,mediawiki,vimwiki setlocal spell
-au FileType text,markdown,mail,gitcommit,mediawiki,vimwiki setlocal formatoptions+=n
+au FileType text,markdown,asciidoc,mail,gitcommit,mediawiki,vimwiki,tex setlocal spell
+au FileType text,markdown,asciidoc,mail,gitcommit,mediawiki,vimwiki setlocal formatoptions+=n
 au Filetype mail setlocal formatoptions+=o
 " Add | for block quotation, such that gq respects it
-au Filetype mail setlocal comments+=n:\|
+au Filetype mail setlocal comments+=n:\|,
 
 au Filetype go setlocal shiftwidth=8 tabstop=8 noexpandtab
 au Filetype tex setlocal shiftwidth=2 tabstop=2
@@ -190,6 +190,7 @@ let g:vimwiki_list = [{'path': '~/.vimwiki/',
       \ 'template_path': '~/.vim/vimwiki/templates',
       \ 'template_default': 'default',
       \ 'template_ext': '.html'}]
+let g:vimwiki_global_ext = 0
 
 " Java completion
 au FileType java setlocal omnifunc=javacomplete#Complete