Skip to content

Commit 0e0d125

Browse files
committed
A ton of changes, a few new plugins, removing a few old ones... prepping for release
1 parent 95b7ab5 commit 0e0d125

File tree

2 files changed

+25
-14
lines changed

2 files changed

+25
-14
lines changed

.vimrc

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,25 @@
4242
Bundle 'altercation/vim-colors-solarized'
4343
Bundle 'spf13/vim-colors'
4444
Bundle 'tpope/vim-surround'
45-
Bundle 'ervandew/supertab'
45+
"Bundle 'ervandew/supertab'
4646
" Pick one of delimitMate or AutoClose
4747
"Bundle 'Raimondi/delimitMate'
4848
Bundle 'AutoClose'
49-
Bundle 'wincent/Command-T'
49+
"Bundle 'wincent/Command-T'
50+
Bundle 'kien/ctrlp.vim'
5051
Bundle 'spf13/vim-preview'
5152
Bundle 'vim-scripts/sessionman.vim'
5253
"Bundle 'greyblake/vim-preview'
5354
Bundle 'matchit.zip'
55+
Bundle 'Lokaltog/vim-powerline'
56+
Bundle 'Lokaltog/vim-easymotion'
5457

5558
" General Programming
5659
"Bundle 'spf13/snipmate.vim'
5760
Bundle 'garbas/vim-snipmate'
5861
Bundle 'spf13/snipmate-snippets'
5962
Bundle 'tpope/vim-fugitive'
63+
Bundle 'tpope/vim-cucumber'
6064
Bundle 'scrooloose/nerdcommenter'
6165
Bundle 'godlygeek/tabular'
6266
Bundle 'majutsushi/tagbar'
@@ -108,7 +112,7 @@
108112
" not every vim is compiled with this, use the following line instead
109113

110114
" 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
112116
scriptencoding utf-8
113117

114118
" set autowrite " automatically write a file when leaving a modified buffer
@@ -273,12 +277,13 @@
273277

274278
" PIV {
275279
let g:DisableAutoPHPFolding = 0
280+
let g:PIVAutoClose = 0
276281
"let cfu=phpcomplete#CompletePHP
277282
" }
278283

279284
" 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>"
282287
"let g:SuperTabContextDefaultCompletionType = "<c-x><c-p>"
283288
"let g:SuperTabMappingForward = '<c-space>'
284289
"let g:SuperTabMappingBackward = '<s-c-space>'
@@ -344,7 +349,7 @@
344349
inoremap <expr> <C-u> pumvisible() ? "\<PageUp>\<C-p>\<C-n>" : "\<C-u>"
345350
346351
" and make sure that it doesn't break supertab
347-
let g:SuperTabCrMapping = 0
352+
"let g:SuperTabCrMapping = 0
348353

349354
" automatically open and close the popup menu / preview window
350355
au CursorMovedI,InsertLeave * if pumvisible() == 0|silent! pclose|endif
@@ -438,10 +443,14 @@
438443
nmap <leader>jt <Esc>:%!python -m json.tool<CR><Esc>:set filetype=json<CR>
439444
" }
440445

441-
" } PyMode
446+
" PyMode {
442447
g:pymode_lint_checker = "pyflakes"
443448
" }
444449

450+
" ctrlp {
451+
let g:ctrlp_working_path_mode = 2
452+
"}
453+
445454
" neocomplcache {
446455
let g:neocomplcache_enable_at_startup = 1
447456
let g:neocomplcache_enable_camel_case_completion = 1
@@ -451,7 +460,7 @@
451460
let g:neocomplcache_enable_auto_delimiter = 1
452461

453462
" AutoComplPop like behavior.
454-
let g:neocomplcache_enable_auto_select = 1
463+
let g:neocomplcache_enable_auto_select = 0
455464

456465
" SuperTab like snippets behavior.
457466
imap <expr><TAB> neocomplcache#sources#snippets_complete#expandable() ? "\<Plug>(neocomplcache_snippets_expand)" : pumvisible() ? "\<C-n>" : "\<TAB>"
@@ -462,11 +471,13 @@
462471
inoremap <expr><C-g> neocomplcache#undo_completion()
463472
inoremap <expr><C-l> neocomplcache#complete_common_string()
464473
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>"
468478
" <TAB>: completion.
469-
inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
479+
"inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
480+
470481
" <C-h>, <BS>: close popup and delete backword char.
471482
inoremap <expr><C-h> neocomplcache#smart_close_popup()."\<C-h>"
472483
inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"

README.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# spf13-vim : Steve Francia's Vim Distribution
22

3-
This is a distribution of vim plugins and tools intended to be run on top of VIM. It is a good starting point for anyone intending to use VIM for development.
3+
spf13-vim is a distribution of vim plugins and resources intended to be run on top of VIM. It is a good starting point for anyone intending to use VIM for development.
44

55
Unlike traditional VIM plugin structure, which similar to UNIX throws all files into common directories, making updating or disabling plugins a real mess, spf13-vim 3 uses [Vundle] to have a well organized vim directory (Similar to mac's app folders). Vundle also ensures that the latest versions of your plugins are installed and makes it easy to keep them up to date.
66

@@ -37,7 +37,7 @@ If it returns 1 your vim supports ruby.
3737

3838
### Easy Installation (\*nix only)
3939

40-
curl https://raw.github.com/spf13/spf13-vim/3.0/bootstrap.sh -o - | sh
40+
curl http://j.mp/spf13-vim3 -o - | sh
4141

4242
or
4343

0 commit comments

Comments
 (0)