diff --git a/_vimrc b/_vimrc index 73d7e28..c879725 100644 --- a/_vimrc +++ b/_vimrc @@ -14,8 +14,9 @@ behave mswin " https://github.com/tomasr/molokai colorscheme molokai - +" jedi-vim plugin config let g:jedi#completions_command = "" +let g:jedi#popup_on_dot = 0 " Ignore case when searching set ignorecase @@ -37,7 +38,7 @@ set fileencodings=ucs-bom,utf-8,gbk,gb2312,cp936,big5,gb18030,shift-jis,latin1 set fileencoding=utf-8 "防止菜单乱码 -if(has("win32") || has("win64")) +if(has("win32") || has("win64") || has("win95") || has("win16")) source $VIMRUNTIME/delmenu.vim source $VIMRUNTIME/menu.vim language messages zh_CN.utf-8 @@ -92,6 +93,8 @@ set nobackup set nowb set noswapfile +map :NERDTree + set diffexpr=MyDiff() function MyDiff() let opt = '-a --binary ' diff --git a/vundle_vimrc b/vundle_vimrc index 1b4d1bf..d8cb566 100644 --- a/vundle_vimrc +++ b/vundle_vimrc @@ -25,6 +25,7 @@ Plugin 'plasticboy/vim-markdown' Plugin 'scrooloose/nerdtree' Plugin 'davidhalter/jedi-vim' Plugin 'ervandew/supertab' +Plugin 'Raimondi/delimitMate' " plugin from http://vim-scripts.org/vim/scripts.html Plugin 'L9'