X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=75f8c34f1c917612f5b0eaaf8848e0033497b0fe;hp=be243ee325fd4b63d8608fc27f3909affae743fd;hb=a89eb6e1fb9a8f310d64c5bc11ca109a887d4461;hpb=205d3d76bfc9b7b755a87327442d72cc6d70cdea

diff --git a/init.vim b/init.vim
index be243ee..75f8c34 100644
--- 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
@@ -57,6 +60,7 @@ runtime plugsetup.vim
 
 " Some preferences for indent detection
 let g:detectindent_min_indent = 2
+let g:detectindent_max_indent = 4
 let g:detectindent_preferred_indent = 4
 
 " Attention: Must be run after plugsetup.vim
@@ -109,7 +113,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!
@@ -124,24 +128,14 @@ let g:vim_markdown_frontmatter=1
 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 *.cls set 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 +144,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
@@ -179,7 +173,7 @@ au FileType markdown call RagtagInit()
 
 let g:detectspelllang_langs = {}
 let g:detectspelllang_langs.aspell =[ 'en_US', 'de_AT']
-"au BufReadPost * :DetectIndent
+au BufReadPost *.java :DetectIndent
 
 au BufEnter *.c* let b:fswitchlocs='reg:/lib/include/,rel:.'
 au BufEnter *.h* let b:fswitchlocs='reg:/include/lib/,rel:.'