X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=277812bd934bd8e6c3447f748711d7d282487a7e;hp=21e8f9a4704df75770bec602831f8ff214f883d8;hb=9115e7e8ffe4b4bc37adb95b9fd51703618dab8f;hpb=a50d445c0e555e50f7250a96ed5a027617b93335

diff --git a/init.vim b/init.vim
index 21e8f9a..277812b 100644
--- a/init.vim
+++ b/init.vim
@@ -38,13 +38,6 @@ set wildmode=longest,list:full
 
 set tabpagemax=100
 
-" Some terminals cause weired symbols due to broken cursor-shape termcodes.
-if has('nvim')
-    "set guicursor=
-    " Workaround some broken plugins which set guicursor indiscriminately.
-    "au OptionSet guicursor noautocmd set guicursor=
-end
-
 syntax on
 
 " Load some macros
@@ -143,12 +136,15 @@ 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 fo+=n
+au FileType text,markdown,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 go setlocal shiftwidth=8 tabstop=8 noexpandtab
 au Filetype tex setlocal shiftwidth=2 tabstop=2
 
-au FileType mediawiki setlocal wrap linebreak tw=0
+au FileType mediawiki setlocal wrap linebreak textwidth=0
 
 "git scissor line
 au Filetype mail syn match Statement /^\s*-*\s*>8\s*-*\s*$/
@@ -167,6 +163,7 @@ au BufEnter *.h* let b:fswitchlocs='reg:/include/lib/,rel:.'
 
 au BufEnter *.cpp,*.cc,*.cxx let b:fswitchdst='h,hxx,hpp,hh'
 au BufEnter *.h,*.hh,*.hxx let b:fswitchdst='cc,c,cxx,cpp'
+au BufNewFile *.{h,hpp,hxx} call AddIncludeGuards()
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some plugin-specific settings