init: Spell out options in long form

diff --git a/init.vim b/init.vim
index 61806e6cd52c48015658fde838301a871b15f2a3..277812bd934bd8e6c3447f748711d7d282487a7e 100644 (file)
--- a/init.vim
+++ b/init.vim
@@ -136,7 +136,7 @@ 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:\|
@@ -144,7 +144,7 @@ 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*$/