init: Spell out options in long form

[vimconf.git] / init.vim

diff --git a/init.vim b/init.vim
index 08935f1364cd14ec878892cce241e9d45de6b6a5..277812bd934bd8e6c3447f748711d7d282487a7e 100644 (file)
--- 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*$/