diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .gitmodules | 9 | ||||
| m--------- | vim/bundle/ctrlp | 0 | ||||
| m--------- | vim/bundle/fuzzyfinder | 0 | ||||
| m--------- | vim/bundle/l9 | 0 | ||||
| -rw-r--r-- | vim/ftplugin/perl.vim | 2 | ||||
| -rw-r--r-- | vimrc | 53 |
7 files changed, 25 insertions, 40 deletions
@@ -3,6 +3,7 @@ bin/nethack/ttrtail procmail/log vim/.netrwhist vim/.VimballRecord +vim/ctrlp/ vim/fuf-data/ vim/yankring-data/ vim/undo/ diff --git a/.gitmodules b/.gitmodules index 91e36d8..f0f4a23 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,12 +19,6 @@ [submodule "vim/bundle/yankring"] path = vim/bundle/yankring url = git://github.com/vim-scripts/YankRing.vim.git -[submodule "vim/bundle/fuzzyfinder"] - path = vim/bundle/fuzzyfinder - url = git://github.com/vim-scripts/FuzzyFinder.git -[submodule "vim/bundle/l9"] - path = vim/bundle/l9 - url = git://github.com/vim-scripts/L9.git [submodule "vim/bundle/perl"] path = vim/bundle/perl url = git://github.com/petdance/vim-perl.git @@ -40,3 +34,6 @@ [submodule "zsh/zsh-syntax-highlighting"] path = zsh/zsh-syntax-highlighting url = git://github.com/zsh-users/zsh-syntax-highlighting +[submodule "vim/bundle/ctrlp"] + path = vim/bundle/ctrlp + url = git://github.com/kien/ctrlp.vim.git diff --git a/vim/bundle/ctrlp b/vim/bundle/ctrlp new file mode 160000 +Subproject 4d5b39c0cf005bc48e6d5916e631c0b444ebc41 diff --git a/vim/bundle/fuzzyfinder b/vim/bundle/fuzzyfinder deleted file mode 160000 -Subproject b9f165970346df55862853dd83c8a4f2b2b7026 diff --git a/vim/bundle/l9 b/vim/bundle/l9 deleted file mode 160000 -Subproject c822b05ee0886f9a9703227dc85a6d47612c4bf diff --git a/vim/ftplugin/perl.vim b/vim/ftplugin/perl.vim index b556a35..bd93eee 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> -nnoremap <buffer> t :FufCoverageFile lib/<CR> +let g:ctrlp_default_input = 'lib/' function! s:unpostfix() let postop_pattern = '\<\(if\|unless\|while\|until\|for\)\>' @@ -585,39 +585,6 @@ let g:Foldtext_tex_enable = 1 let g:Foldtext_cpp_enable = 1 let g:Foldtext_perl_enable = 1 " }}} -" FuzzyFinder {{{ -nmap t :FufCoverageFile<CR> -nmap b :FufBuffer<CR> -nmap f :FufLine!<CR> -let g:fuf_modesDisable = [ - \'mrufile', 'mrucmd', 'bookmarkfile', 'bookmarkdir', - \'tag', 'buffertag', 'taggedfile', 'jumplist', 'changelist', - \'quickfix', -\] -let g:fuf_keyPrevPattern = '<Up>' -let g:fuf_keyNextPattern = '<Down>' -let g:fuf_dataDir = '~/.vim/fuf-data' -let g:fuf_enumeratingLimit = 10 -" exclusions {{{ -function! s:set_excludes() - let fuf_coveragefile_exclude_base = '\(' - \. '\(^\|/\)\.\|' - \. '\~$\|' - \. '^\(blib\|nytprof\)\|' - \. '\.\(' - \. 'o\|exe\|dll\|bak\|orig\|swp\|bs\|' - \. 'png\|jpg\|gif\|pdf\|doc\|d\|vsprops\|pbxproj\|sln' - \. '\)$' - \. '\)' - let g:fuf_coveragefile_exclude = fuf_coveragefile_exclude_base - if filereadable("dist.ini") - let g:fuf_coveragefile_exclude .= '\|^' . fnamemodify('.', ':p:h:t') . '-' - endif -endfunction -autocmd BufReadPost * call <SID>set_excludes() -" call <SID>set_excludes() -" }}} -" }}} " Yankring {{{ let g:yankring_history_dir = '~/.vim/yankring-data' let g:yankring_clipboard_monitor = 0 @@ -660,4 +627,24 @@ else let g:gundo_disable = 1 endif " }}} +" ctrlp {{{ +let g:ctrlp_map = 't' +let g:ctrlp_match_window_bottom = 0 +let g:ctrlp_match_window_reversed = 0 +let g:ctrlp_cache_dir = $HOME.'/.vim/ctrlp/cache' +let g:ctrlp_dotfiles = 0 +let g:ctrlp_open_new_file = 'r' +let g:ctrlp_open_multiple_files = '1r' +let g:ctrlp_arg_map = 0 +let g:ctrlp_lazy_update = 100 +let g:ctrlp_prompt_mappings = { + \ 'PrtSelectMove("j")': ['<c-j>', '<tab>'], + \ 'PrtSelectMove("k")': ['<c-k>', '<s-tab>'], + \ 'PrtHistory(-1)': ['<c-n>', '<down>'], + \ 'PrtHistory(1)': ['<c-p>', '<up>'], + \ 'PrtExpandDir()': [], + \ 'ToggleFocus()': [], + \ 'MarkToOpen()': ['<c-z>', '<space>'], +\ } +" }}} " }}} |