diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Makefile | 7 | ||||
| m--------- | vim/bundle/vimproc | 0 | ||||
| -rw-r--r-- | vim/ftplugin/perl.vim | 2 | ||||
| -rw-r--r-- | vim/ftplugin/scala.vim | 2 | ||||
| -rw-r--r-- | vimrc | 6 |
6 files changed, 15 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index f6ac18f..2530c00 100644 --- a/.gitmodules +++ b/.gitmodules @@ -55,3 +55,6 @@ [submodule "vim/bundle/vimfiler"] path = vim/bundle/vimfiler url = git://github.com/Shougo/vimfiler.vim +[submodule "vim/bundle/vimproc"] + path = vim/bundle/vimproc + url = git://github.com/Shougo/vimproc.vim @@ -57,7 +57,9 @@ INSTALL = abcde.conf \ zsh INSTALLED = $(patsubst %,$(INTO)/.%,$(INSTALL)) -BUILD = bin/nethack/timettyrec $(addsuffix .dat,$(filter-out %.dat,$(wildcard fortune/*))) +BUILD = bin/nethack/timettyrec \ + $(addsuffix .dat,$(filter-out %.dat,$(wildcard fortune/*))) \ + vim/bundle/vimproc/autoload/vimproc_unix.so EMPTYDIRS = .log .vim/undo @@ -88,4 +90,7 @@ fortune/%.dat : fortune/% @echo "Compiling $@" @strfile -s $(basename $@) +vim/bundle/vimproc/autoload/vimproc_unix.so : vim/bundle/vimproc/autoload/proc.c + cd vim/bundle/vimproc && make + .PHONY: build install clean diff --git a/vim/bundle/vimproc b/vim/bundle/vimproc new file mode 160000 +Subproject 987c6182b6236f9bae0ea41affcc2af41316282 diff --git a/vim/ftplugin/perl.vim b/vim/ftplugin/perl.vim index 13ba40b..7eb1862 100644 --- a/vim/ftplugin/perl.vim +++ b/vim/ftplugin/perl.vim @@ -20,7 +20,7 @@ vmap <buffer> <silent>K :call Help(1, [':'], '<SID>perldoc')<CR> nmap <buffer> <silent>gf :exe v:count . 'find ' . substitute(expand('<cfile>'), '::', '/', 'g') . '.pm'<CR> " XXX: <cfile> is wrong here, need to do something like i do for Help "vmap <buffer> <silent>gf :exe v:count . 'find ' . substitute(expand('<cfile>'), '::', '/', 'g') . '.pm'<CR> -nmap <silent> t :Unite -start-insert -silent -input=lib/ buffer file_rec<CR> +call unite#custom#profile('default', 'context', {'input' : 'lib/**/'}) function! s:unpostfix() let postop_pattern = '\<\(if\|unless\|while\|until\|for\)\>' diff --git a/vim/ftplugin/scala.vim b/vim/ftplugin/scala.vim index eeaed87..a222ee0 100644 --- a/vim/ftplugin/scala.vim +++ b/vim/ftplugin/scala.vim @@ -1 +1 @@ -nmap <silent> t :Unite -start-insert -silent -input=src/ buffer file_rec<CR> +call unite#custom#profile('default', 'context', {'input' : 'src/**/'}) @@ -674,6 +674,7 @@ endfor " }}} " unite {{{ let g:unite_data_directory = '~/.vim/unite' +let g:unite_source_rec_max_cache_files = 20000 let rec_exclude = '\(' \. '\(^\|/\)\.\|' \. '\~$\|' @@ -686,7 +687,8 @@ let rec_exclude = '\(' if filereadable("dist.ini") let rec_exclude .= '\|^' . fnamemodify('.', ':p:h:t') . '-' endif -call unite#custom#source('file_rec', 'ignore_pattern', rec_exclude) +call unite#custom#source('file_rec/async', 'ignore_pattern', rec_exclude) +call unite#custom#source('file_rec/async', 'converters', ['converter_relative_word']) autocmd FileType unite call s:unite_my_settings() function! s:unite_my_settings() nmap <silent><buffer> \ <Plug>(unite_exit) @@ -695,7 +697,7 @@ function! s:unite_my_settings() imap <silent><buffer> <Tab> <Plug>(unite_select_next_line) imap <silent><buffer> <S-Tab> <Plug>(unite_select_previous_line) endfunction -nmap <silent> t :Unite -start-insert -silent buffer file_rec<CR> +nmap <silent> t :Unite -start-insert -silent buffer file_rec/async<CR> " }}} " vimfiler {{{ let g:vimfiler_data_directory = '~/.vim/vimfiler' |