init: Move guicursor fix to init-local example

[vimconf.git] / init.vim

diff --git a/init.vim b/init.vim
index 21e8f9a4704df75770bec602831f8ff214f883d8..2da7cac0d3816f326a38b0c46d76b4f46fe177ef 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
@@ -167,6 +160,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