Skip to content

Commit

Permalink
enable jedi again, add ctrl-p, misc fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
djs committed Nov 5, 2012
1 parent 224e27b commit 685c5b0
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions _vimrc
Expand Up @@ -45,21 +45,19 @@ Bundle 'honza/snipmate-snippets'
Bundle 'tpope/vim-surround'
"Bundle 'jpythonfold.vim'
"Bundle 'tpope/vim-abolish'
Bundle 'Command-T'
Bundle 'sjl/gundo.vim.git'
"Bundle 'kevinw/pyflakes-vim'
Bundle 'nvie/vim-flake8'
Bundle 'fs111/pydoc.vim'
Bundle 'jmcantrell/vim-virtualenv'
Bundle 'flazz/vim-colorschemes'
"Bundle 'CycleColor'
Bundle 'jeetsukumaran/vim-buffergator'
"Bundle 'AutoComplPop'
Bundle 'tpope/vim-haml'
Bundle 'kchmck/vim-coffee-script'
Bundle 'Lokaltog/vim-powerline'
Bundle 'tarmack/vim-python-ftplugin'
"Bundle 'davidhalter/jedi-vim'
"Bundle 'tarmack/vim-python-ftplugin'
Bundle 'davidhalter/jedi-vim'
Bundle 'mattn/zencoding-vim'
Bundle 'tpope/vim-repeat'
Bundle 'skammer/vim-css-color'
Expand All @@ -69,6 +67,9 @@ Bundle 'juvenn/mustache.vim'
Bundle 'tpope/vim-unimpaired'
Bundle 'tpope/vim-commentary'
Bundle 'tsaleh/vim-matchit'
Bundle 'majutsushi/tagbar'
Bundle 'sandeepcr529/Buffet.vim'
Bundle 'kien/ctrlp.vim'

" Basic options
"-------------------------------------------------------------------------------
Expand Down Expand Up @@ -134,7 +135,7 @@ set ruler
set number

" status line
set cmdheight=1
set cmdheight=2
set laststatus=2

"syntastic settings
Expand Down Expand Up @@ -231,9 +232,11 @@ let Powerline_symbols="unicode"

let g:python_syntax_fold=0
let g:jedi#use_tabs_not_buffers = 0
"let g:jedi#show_function_definition = 0

inoremap jk <Esc>
inoremap <Esc> <nop>
inoremap <C-c> <Esc>
inoremap <Up> <nop>
inoremap <Down> <nop>
inoremap <Left> <nop>
Expand All @@ -249,5 +252,6 @@ map <C-k> <C-w>k
map <C-l> <C-w>l
nnoremap <leader>g :GundoToggle<CR>
nnoremap <silent> <F2> :let @/=""<cr>
:nnoremap <leader>ev :vsplit $MYVIMRC<cr>
:nnoremap <leader>sv :source $MYVIMRC<cr>
nnoremap <leader>ev :vsplit $MYVIMRC<cr>
nnoremap <leader>sv :source $MYVIMRC<cr>
noremap <leader>b :Bufferlist<CR>

0 comments on commit 685c5b0

Please sign in to comment.