console/spf13-vim
1
0
Fork 0
mirror of https://github.com/spf13/spf13-vim.git synced 2024-09-21 07:27:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update some formatting

Browse Source
This commit is contained in:
Stephen Bennett 2013-08-28 18:11:58 -06:00 committed by spf13
parent c6014b98c4
commit 6c379d3a72
2 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.vimrc
View File

@ -262,9 +262,9 @@
" Easier moving in tabs and windows
" The lines conflict with the default digraph mapping of <C-K>
" If you prefer that functionality, add let g:spf13_no_easyWindows = 1
" in your .vimrc.before.local file
" If you prefer that functionality, add the following to your
" .vimrc.before.local file:
" let g:spf13_no_easyWindows = 1
if !exists('g:spf13_no_easyWindows')
map <C-J> <C-W>j<C-W>_
map <C-K> <C-W>k<C-W>_
@ -576,13 +576,11 @@
endif
let g:neocomplete#keyword_patterns['default'] = '\h\w*'
" Plugin key-mappings.
" Plugin key-mappings {
" These two lines conflict with the default digraph mapping of <C-K>
" If you prefer that functionality, add
" If you prefer that functionality, add the following to your
" .vimrc.before.local file:
" let g:spf13_no_neosnippet_expand = 1
" in your .vimrc.before.local file
if !exists('g:spf13_no_neosnippet_expand')
imap <C-k> <Plug>(neosnippet_expand_or_jump)
smap <C-k> <Plug>(neosnippet_expand_or_jump)
@ -604,6 +602,7 @@
" <C-h>, <BS>: close popup and delete backword char.
inoremap <expr><BS> neocomplete#smart_close_popup()."\<C-h>"
inoremap <expr><C-y> neocomplete#close_popup()
" }
" Enable omni completion.
autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
@ -679,13 +678,11 @@
endif
let g:neocomplcache_keyword_patterns._ = '\h\w*'
" Plugin key-mappings.
" Plugin key-mappings {
" These two lines conflict with the default digraph mapping of <C-K>
" If you prefer that functionality, add
" If you prefer that functionality, add the following to your
" .vimrc.before.local file:
" let g:spf13_no_neosnippet_expand = 1
" in your .vimrc.before.local file
if !exists('g:spf13_no_neosnippet_expand')
imap <C-k> <Plug>(neosnippet_expand_or_jump)
smap <C-k> <Plug>(neosnippet_expand_or_jump)
@ -707,6 +704,7 @@
" <C-h>, <BS>: close popup and delete backword char.
inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"
inoremap <expr><C-y> neocomplcache#close_popup()
" }
" Enable omni completion.
autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS

7
.vimrc.bundles
View File

@ -57,7 +57,7 @@
" Bundles {
" Deps
" Deps {
Bundle 'gmarik/vundle'
Bundle 'MarcWeber/vim-addon-mw-utils'
Bundle 'tomtom/tlib_vim'
@ -70,14 +70,15 @@
Bundle 'mileszs/ack.vim'
let g:ackprg = 'ag --nogroup --nocolor --column --smart-case'
endif
" }
" Use local bundles if available {
" Use local bundles config if available {
if filereadable(expand("~/.vimrc.bundles.local"))
source ~/.vimrc.bundles.local
endif
" }
" Use fork bundles if available {
" Use fork bundles config if available {
if filereadable(expand("~/.vimrc.bundles.fork"))
source ~/.vimrc.bundles.fork
endif