X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=d5ad8eb35da2dd34a5830ff217202f285db3b164;hp=d38072627a1458dc24fbe6335d3e8f4a168a2acb;hb=f8b34fbb5f65efffa11b3ee5018c5c924b2a95b5;hpb=e4915532466771c14129c2a1a403bf414b6f1832

diff --git a/init.vim b/init.vim
index d380726..d5ad8eb 100644
--- a/init.vim
+++ b/init.vim
@@ -31,6 +31,9 @@ set smartindent
 set incsearch
 set hlsearch
 
+set foldcolumn=4
+set foldlevelstart=20
+
 set colorcolumn=+1
 set mouse=a
 set wildmenu
@@ -127,7 +130,6 @@ au InsertEnter * call deoplete#enable()
   "au FileType tex          call pencil#init()
 "augroup END
 
-let g:vim_markdown_folding_disabled=1
 let g:vim_markdown_frontmatter=1
 let g:vim_markdown_math=1
 
@@ -135,11 +137,11 @@ 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 formatoptions+=n
+au FileType text,markdown,asciidoc,mail,gitcommit,mediawiki,vimwiki,tex setlocal spell
+au FileType text,markdown,asciidoc,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:\|
+au Filetype mail setlocal comments+=n:\|,
 
 au Filetype go setlocal shiftwidth=8 tabstop=8 noexpandtab
 au Filetype tex setlocal shiftwidth=2 tabstop=2
@@ -165,6 +167,11 @@ 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()
 
+augroup autofoldcolumn
+  au!
+  au CursorHold,BufWinEnter * AutoOrigamiFoldColumn
+augroup END
+
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some plugin-specific settings
 
@@ -184,23 +191,11 @@ let g:vimwiki_list = [{'path': '~/.vimwiki/',
       \ 'template_path': '~/.vim/vimwiki/templates',
       \ 'template_default': 'default',
       \ 'template_ext': '.html'}]
+let g:vimwiki_global_ext = 0
 
 " Java completion
 au FileType java setlocal omnifunc=javacomplete#Complete
 au FileType java JCEnable
-" See https://github.com/artur-shaik/vim-Javacomplete2
-" <C-j>ji <leader>ji
-au FileType java nmap <F4> <Plug>(JavaComplete-Imports-AddSmart)
-au FileType java imap <F4> <Plug>(JavaComplete-Imports-AddSmart)
-" <C-j>ii <leader>jii
-au FileType java nmap <F5> <Plug>(JavaComplete-Imports-Add)
-au FileType java imap <F5> <Plug>(JavaComplete-Imports-Add)
-" <C-j>I <leader>jI
-au FileType java nmap <F6> <Plug>(JavaComplete-Imports-AddMissing)
-au FileType java imap <F6> <Plug>(JavaComplete-Imports-AddMissing)
-" <C-j>R <leader>jR
-au FileType java nmap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
-au FileType java imap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
 
 let g:VimMailContactsProvider=['khard']
 let g:VimMailContactsCommands={