init: Turn autocmd to au

[vimconf.git] / init.vim

diff --git a/init.vim b/init.vim
index be243ee325fd4b63d8608fc27f3909affae743fd..2609899e3640fac2ae2043a0007a2a0c6d0b6a5e 100644 (file)
--- a/init.vim
+++ b/init.vim
@@ -35,8 +35,11 @@ set wildmode=longest,list:full
 
 set tabpagemax=100
 
+" Some terminals cause weired symbols due to broken cursor-shape termcodes.
 if has('nvim')
-    set guicursor=
+    "set guicursor=
+    " Workaround some broken plugins which set guicursor indiscriminately.
+    "au OptionSet guicursor noautocmd set guicursor=
 end
 
 syntax on
@@ -46,7 +49,7 @@ syntax on
 " Some global plugin settings
 
 " Disable devicons on linux terminal
-if !has("terminfo") || &term == 'linux'
+if $TERM == 'linux'
     let g:enable_plugin_devicons=0
 " Enable loading of devicons on all others
 else
@@ -109,7 +112,7 @@ let g:python3_host_prog = '/usr/bin/python3'
 " deoplete requires huge startuptime. Delay loading upon first InsertEnter.
 let g:deoplete#enable_at_startup = 0
 let g:deoplete#enable_smart_case = 1
-autocmd InsertEnter * call deoplete#enable()
+au InsertEnter * call deoplete#enable()
 
 "augroup pencil
   "au!
@@ -128,20 +131,20 @@ let g:vim_markdown_math=1
 " Some filetype settings
 
 " mutt and neomutt
-au BufRead,BufNewFile ~/.mutt/tmp/*mutt-* set filetype=mail
-au BufRead,BufNewFile *.muttrc set filetype=muttrc
+au BufRead,BufNewFile ~/.mutt/tmp/*mutt-* setlocal filetype=mail
+au BufRead,BufNewFile *.muttrc setlocal filetype=muttrc
 
-au BufRead,BufNewFile *.cls set filetype=tex
+au BufRead,BufNewFile *.cls setlocal filetype=tex
 
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some filetype-specific settings
 
 au FileType text,markdown,mail,tex,gitcommit,mediawiki,vimwiki setlocal spell
-au FileType text,markdown,mail,gitcommit,mediawiki,vimwiki set fo+=n
+au FileType text,markdown,mail,gitcommit,mediawiki,vimwiki setlocal fo+=n
 
-au Filetype go set shiftwidth=8 tabstop=8 noexpandtab
-au Filetype tex set shiftwidth=2 tabstop=2
+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
 
@@ -150,7 +153,7 @@ au Filetype mail syn match Statement /^\s*-*\s*>8\s*-*\s*$/
 au Filetype mail syn match Statement /^\s*-*\s*8<\s*-*\s*$/
 
 " Line wrap crippled with numbers shown
-au Filetype man set nonumber
+au Filetype man setlocal nonumber
 
 " Java completion
 au FileType java setlocal omnifunc=javacomplete#Complete