Skip to content

Commit

Permalink
switch from command-t to ctrlp.vim and remove some unused stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
crittermike committed Sep 19, 2011
1 parent eb0c56e commit 5b1a924
Showing 1 changed file with 7 additions and 20 deletions.
27 changes: 7 additions & 20 deletions .vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Bundle 'gmarik/vundle'
" GitHub repos
Bundle 'tpope/vim-fugitive'
Bundle 'tpope/vim-surround'
Bundle 'wincent/Command-T'
Bundle 'Townk/vim-autoclose'
Bundle 'kien/ctrlp.vim'
Bundle 'mattn/gist-vim'
Bundle 'mattn/zencoding-vim'
Bundle 'edsono/vim-matchit'
Expand All @@ -30,8 +30,6 @@ Bundle 'vim-scripts/molokai'
Bundle 'vim-scripts/closetag.vim'
Bundle 'vim-scripts/php.vim-html-enhanced'

filetype plugin indent on

" Set filetype detection on, load plugins and indent.
filetype plugin indent on

Expand Down Expand Up @@ -162,23 +160,12 @@ colorscheme molokai
let g:user_zen_expandabbr_key = '<c-e>'
let g:use_zen_complete_tag = 1

" Map <Tab> to C-x C-o to open omnicomplete popup, but only if there is text
" to complete. Otherwise, just do a normal tab.
function! TabAutocomplete()
if strpart(getline('.'), 0, col('.') - 1) =~ '^\s*$'
return "\<Tab>"
else
if &omnifunc != ''
return "\<C-X>\<C-O>"
elseif &dictionary != ''
return "\<C-K>"
else
return "\<C-N>"
endif
endif
endfunction

inoremap <Tab> <C-R>=TabAutocomplete()<cr>
" Set options for ctrlp.vim
"set wildignore+=*/.git/*,*/.hg/*,*/.svn/*
let g:ctrlp_dotfiles = 0
let g:ctrlp_working_path_mode = 0
let g:ctrlp_match_window_reversed = 0
let g:ctrlp_persistent_input = 0

" If you prefer the Omni-Completion tip window to close when a selection is
" made, these lines close it on movement in insert mode or when leaving
Expand Down

0 comments on commit 5b1a924

Please sign in to comment.