|
42 | 42 | Bundle 'altercation/vim-colors-solarized'
|
43 | 43 | Bundle 'spf13/vim-colors'
|
44 | 44 | Bundle 'tpope/vim-surround'
|
45 |
| - Bundle 'ervandew/supertab' |
| 45 | + "Bundle 'ervandew/supertab' |
46 | 46 | " Pick one of delimitMate or AutoClose
|
47 | 47 | "Bundle 'Raimondi/delimitMate'
|
48 | 48 | Bundle 'AutoClose'
|
49 |
| - Bundle 'wincent/Command-T' |
| 49 | + "Bundle 'wincent/Command-T' |
| 50 | + Bundle 'kien/ctrlp.vim' |
50 | 51 | Bundle 'spf13/vim-preview'
|
51 | 52 | Bundle 'vim-scripts/sessionman.vim'
|
52 | 53 | "Bundle 'greyblake/vim-preview'
|
53 | 54 | Bundle 'matchit.zip'
|
| 55 | + Bundle 'Lokaltog/vim-powerline' |
| 56 | + Bundle 'Lokaltog/vim-easymotion' |
54 | 57 |
|
55 | 58 | " General Programming
|
56 | 59 | "Bundle 'spf13/snipmate.vim'
|
57 | 60 | Bundle 'garbas/vim-snipmate'
|
58 | 61 | Bundle 'spf13/snipmate-snippets'
|
59 | 62 | Bundle 'tpope/vim-fugitive'
|
| 63 | + Bundle 'tpope/vim-cucumber' |
60 | 64 | Bundle 'scrooloose/nerdcommenter'
|
61 | 65 | Bundle 'godlygeek/tabular'
|
62 | 66 | Bundle 'majutsushi/tagbar'
|
|
108 | 112 | " not every vim is compiled with this, use the following line instead
|
109 | 113 |
|
110 | 114 | " If you use command-t plugin, it conflicts with this, comment it out.
|
111 |
| - "autocmd BufEnter * if bufname("") !~ "^\[A-Za-z0-9\]*://" | lcd %:p:h | endif |
| 115 | + autocmd BufEnter * if bufname("") !~ "^\[A-Za-z0-9\]*://" | lcd %:p:h | endif |
112 | 116 | scriptencoding utf-8
|
113 | 117 |
|
114 | 118 | " set autowrite " automatically write a file when leaving a modified buffer
|
|
273 | 277 |
|
274 | 278 | " PIV {
|
275 | 279 | let g:DisableAutoPHPFolding = 0
|
| 280 | + let g:PIVAutoClose = 0 |
276 | 281 | "let cfu=phpcomplete#CompletePHP
|
277 | 282 | " }
|
278 | 283 |
|
279 | 284 | " Supertab {
|
280 |
| - let g:SuperTabDefaultCompletionType = "context" |
281 |
| - let g:SuperTabContextDefaultCompletionType = "<c-x><c-o>" |
| 285 | + "let g:SuperTabDefaultCompletionType = "context" |
| 286 | + "let g:SuperTabContextDefaultCompletionType = "<c-x><c-o>" |
282 | 287 | "let g:SuperTabContextDefaultCompletionType = "<c-x><c-p>"
|
283 | 288 | "let g:SuperTabMappingForward = '<c-space>'
|
284 | 289 | "let g:SuperTabMappingBackward = '<s-c-space>'
|
|
344 | 349 | inoremap <expr> <C-u> pumvisible() ? "\<PageUp>\<C-p>\<C-n>" : "\<C-u>"
|
345 | 350 |
|
346 | 351 | " and make sure that it doesn't break supertab
|
347 |
| - let g:SuperTabCrMapping = 0 |
| 352 | + "let g:SuperTabCrMapping = 0 |
348 | 353 |
|
349 | 354 | " automatically open and close the popup menu / preview window
|
350 | 355 | au CursorMovedI,InsertLeave * if pumvisible() == 0|silent! pclose|endif
|
|
438 | 443 | nmap <leader>jt <Esc>:%!python -m json.tool<CR><Esc>:set filetype=json<CR>
|
439 | 444 | " }
|
440 | 445 |
|
441 |
| - " } PyMode |
| 446 | + " PyMode { |
442 | 447 | g:pymode_lint_checker = "pyflakes"
|
443 | 448 | " }
|
444 | 449 |
|
| 450 | + " ctrlp { |
| 451 | + let g:ctrlp_working_path_mode = 2 |
| 452 | + "} |
| 453 | + |
445 | 454 | " neocomplcache {
|
446 | 455 | let g:neocomplcache_enable_at_startup = 1
|
447 | 456 | let g:neocomplcache_enable_camel_case_completion = 1
|
|
451 | 460 | let g:neocomplcache_enable_auto_delimiter = 1
|
452 | 461 |
|
453 | 462 | " AutoComplPop like behavior.
|
454 |
| - let g:neocomplcache_enable_auto_select = 1 |
| 463 | + let g:neocomplcache_enable_auto_select = 0 |
455 | 464 |
|
456 | 465 | " SuperTab like snippets behavior.
|
457 | 466 | imap <expr><TAB> neocomplcache#sources#snippets_complete#expandable() ? "\<Plug>(neocomplcache_snippets_expand)" : pumvisible() ? "\<C-n>" : "\<TAB>"
|
|
462 | 471 | inoremap <expr><C-g> neocomplcache#undo_completion()
|
463 | 472 | inoremap <expr><C-l> neocomplcache#complete_common_string()
|
464 | 473 |
|
465 |
| - " Recommended key-mappings. |
466 |
| - " <CR>: close popup and save indent. |
467 |
| - inoremap <expr><CR> neocomplcache#close_popup() . "\<CR>" |
| 474 | + " <CR>: close popup |
| 475 | + " <s-CR>: close popup and save indent. |
| 476 | + inoremap <expr><CR> neocomplcache#close_popup() |
| 477 | + inoremap <expr><s-CR> neocomplcache#close_popup() . "\<CR>" |
468 | 478 | " <TAB>: completion.
|
469 |
| - inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>" |
| 479 | + "inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>" |
| 480 | + |
470 | 481 | " <C-h>, <BS>: close popup and delete backword char.
|
471 | 482 | inoremap <expr><C-h> neocomplcache#smart_close_popup()."\<C-h>"
|
472 | 483 | inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"
|
|
0 commit comments