mail: Add fo+=o and | for block quotation

[vimconf.git] / init.vim

diff --git a/init.vim b/init.vim
index af5fee7762e7b76394991d8bd280956fc7c9d653..61806e6cd52c48015658fde838301a871b15f2a3 100644 (file)
--- a/init.vim
+++ b/init.vim
@@ -33,17 +33,11 @@ set hlsearch
 
 set colorcolumn=+1
 set mouse=a
+set wildmenu
 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,6 +137,9 @@ let g:vim_markdown_math=1
 
 au FileType text,markdown,mail,tex,gitcommit,mediawiki,vimwiki setlocal spell
 au FileType text,markdown,mail,gitcommit,mediawiki,vimwiki setlocal fo+=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
@@ -166,6 +163,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