X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=keymaps.vim;h=883b3e00eac93e837ba1a748edc13dc61c7fdee3;hp=7f04452831005fddea1498ff5134a9c12e8b5fcc;hb=940c5d4d85492624fab8c01bfd8c98e3eadadc42;hpb=cdf1fddcd88dace1209bff22fee2337ee9ff9a01

diff --git a/keymaps.vim b/keymaps.vim
index 7f04452..883b3e0 100644
--- a/keymaps.vim
+++ b/keymaps.vim
@@ -1,3 +1,6 @@
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Global settings
+
 nnoremap <C-p> :Denite file/rec<cr>
 nnoremap <space>/ :Denite grep:.<cr>
 nnoremap <space>s :Denite buffer<cr>
@@ -6,7 +9,6 @@ nnoremap <C-space> pumvisible() ? "\<c-n>" : "\<tab>"
 
 nnoremap <F2> :NERDTreeToggle<cr>
 nnoremap <F3> :TagbarToggle<cr>
-au Filetype gnuplot map <buffer> <F5> :call OpenIn("gnuplot -persist") <CR>
 
 nmap <s-PageDown> :bn<CR>
 nmap <s-PageUp>   :bp<CR>
@@ -17,17 +19,44 @@ imap <C-k>     <Plug>(neosnippet_expand_or_jump)
 smap <C-k>     <Plug>(neosnippet_expand_or_jump)
 xmap <C-k>     <Plug>(neosnippet_expand_target)
 
-au Filetype c,cpp,objc map <buffer> <F11> :vsplit<CR>:FSRight<CR>
-au Filetype c,cpp,objc map <buffer> <S-F11> :FSHere<CR>
-au BufNewFile *.{h,hpp,hxx} call AddIncludeGuards()
-
-au Filetype markdown map <buffer> <F5> :call RunPandoc()<CR>
-
 " Start interactive EasyAlign in visual mode (e.g. vipga)
 vmap <Enter> <Plug>(EasyAlign)
 " Start interactive EasyAlign for a motion/text object (e.g. gaip)
 nmap ga <Plug>(EasyAlign)
 
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Some filetype-specific settings
+
+au Filetype gnuplot map <buffer> <F5> :call OpenIn("gnuplot -persist") <CR>
+
+au Filetype c,cpp,objc map <buffer> <F11> :vsplit<CR>:FSRight<CR>
+au Filetype c,cpp,objc map <buffer> <S-F11> :FSHere<CR>
+
+au Filetype markdown map <buffer> <F5> :call RunMarkdown()<CR>
+au Filetype asciidoc map <buffer> <F5> :call RunAsciidoc()<CR>
+
+" 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)
+
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Some plugin-specific settings
+
+
+
+
 if filereadable($HOME . '/.vim/keymaps-local.vim')
   source ~/.vim/keymaps-local.vim
 endif