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

108
.vimrc
View File

@ -177,7 +177,7 @@
highlight clear LineNr " Current line number row will have same background color in relative mode. highlight clear LineNr " Current line number row will have same background color in relative mode.
" Things like vim-gitgutter will match LineNr highlight " Things like vim-gitgutter will match LineNr highlight
"highlight clear CursorLineNr " Remove highlight color from current line number "highlight clear CursorLineNr " Remove highlight color from current line number
if has('cmdline_info') if has('cmdline_info')
set ruler " Show the ruler set ruler " Show the ruler
@ -262,9 +262,9 @@
" Easier moving in tabs and windows " Easier moving in tabs and windows
" The lines conflict with the default digraph mapping of <C-K> " The lines conflict with the default digraph mapping of <C-K>
" If you prefer that functionality, add let g:spf13_no_easyWindows = 1 " If you prefer that functionality, add the following to your
" in your .vimrc.before.local file " .vimrc.before.local file:
" let g:spf13_no_easyWindows = 1
if !exists('g:spf13_no_easyWindows') if !exists('g:spf13_no_easyWindows')
map <C-J> <C-W>j<C-W>_ map <C-J> <C-W>j<C-W>_
map <C-K> <C-W>k<C-W>_ map <C-K> <C-W>k<C-W>_
@ -529,7 +529,7 @@
"} "}
" PythonMode { " PythonMode {
" Disable if python support not present " Disable if python support not present
if !has('python') if !has('python')
let g:pymode = 1 let g:pymode = 1
endif endif
@ -576,34 +576,33 @@
endif endif
let g:neocomplete#keyword_patterns['default'] = '\h\w*' 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 the following to your
" .vimrc.before.local file:
" let g:spf13_no_neosnippet_expand = 1
if !exists('g:spf13_no_neosnippet_expand')
imap <C-k> <Plug>(neosnippet_expand_or_jump)
smap <C-k> <Plug>(neosnippet_expand_or_jump)
endif
" These two lines conflict with the default digraph mapping of <C-K> inoremap <expr><C-g> neocomplete#undo_completion()
" If you prefer that functionality, add inoremap <expr><C-l> neocomplete#complete_common_string()
" let g:spf13_no_neosnippet_expand = 1 inoremap <expr><CR> neocomplete#complete_common_string()
" in your .vimrc.before.local file
if !exists('g:spf13_no_neosnippet_expand') " <TAB>: completion.
imap <C-k> <Plug>(neosnippet_expand_or_jump) inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
smap <C-k> <Plug>(neosnippet_expand_or_jump) inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<TAB>"
endif
inoremap <expr><C-g> neocomplete#undo_completion() " <CR>: close popup
inoremap <expr><C-l> neocomplete#complete_common_string() " <s-CR>: close popup and save indent.
inoremap <expr><CR> neocomplete#complete_common_string() inoremap <expr><s-CR> pumvisible() ? neocomplete#close_popup()"\<CR>" : "\<CR>"
inoremap <expr><CR> pumvisible() ? neocomplete#close_popup() : "\<CR>"
" <TAB>: completion. " <C-h>, <BS>: close popup and delete backword char.
inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>" inoremap <expr><BS> neocomplete#smart_close_popup()."\<C-h>"
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<TAB>" inoremap <expr><C-y> neocomplete#close_popup()
" }
" <CR>: close popup
" <s-CR>: close popup and save indent.
inoremap <expr><s-CR> pumvisible() ? neocomplete#close_popup()"\<CR>" : "\<CR>"
inoremap <expr><CR> pumvisible() ? neocomplete#close_popup() : "\<CR>"
" <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. " Enable omni completion.
autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
@ -679,34 +678,33 @@
endif endif
let g:neocomplcache_keyword_patterns._ = '\h\w*' 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 the following to your
" .vimrc.before.local file:
" let g:spf13_no_neosnippet_expand = 1
if !exists('g:spf13_no_neosnippet_expand')
imap <C-k> <Plug>(neosnippet_expand_or_jump)
smap <C-k> <Plug>(neosnippet_expand_or_jump)
endif
" These two lines conflict with the default digraph mapping of <C-K> inoremap <expr><C-g> neocomplcache#undo_completion()
" If you prefer that functionality, add inoremap <expr><C-l> neocomplcache#complete_common_string()
" let g:spf13_no_neosnippet_expand = 1 inoremap <expr><CR> neocomplcache#complete_common_string()
" in your .vimrc.before.local file
if !exists('g:spf13_no_neosnippet_expand') " <TAB>: completion.
imap <C-k> <Plug>(neosnippet_expand_or_jump) inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
smap <C-k> <Plug>(neosnippet_expand_or_jump) inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<TAB>"
endif
inoremap <expr><C-g> neocomplcache#undo_completion() " <CR>: close popup
inoremap <expr><C-l> neocomplcache#complete_common_string() " <s-CR>: close popup and save indent.
inoremap <expr><CR> neocomplcache#complete_common_string() inoremap <expr><s-CR> pumvisible() ? neocomplcache#close_popup()"\<CR>" : "\<CR>"
inoremap <expr><CR> pumvisible() ? neocomplcache#close_popup() : "\<CR>"
" <TAB>: completion. " <C-h>, <BS>: close popup and delete backword char.
inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>" inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<TAB>" inoremap <expr><C-y> neocomplcache#close_popup()
" }
" <CR>: close popup
" <s-CR>: close popup and save indent.
inoremap <expr><s-CR> pumvisible() ? neocomplcache#close_popup()"\<CR>" : "\<CR>"
inoremap <expr><CR> pumvisible() ? neocomplcache#close_popup() : "\<CR>"
" <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. " Enable omni completion.
autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
@ -774,8 +772,8 @@
" airline { " airline {
let g:airline_theme='powerlineish' " airline users use the powerline theme let g:airline_theme='powerlineish' " airline users use the powerline theme
if !exists('g:airline_powerline_fonts') if !exists('g:airline_powerline_fonts')
let g:airline_left_sep='›' " Slightly fancier separator, instead of '>' let g:airline_left_sep='›' " Slightly fancier separator, instead of '>'
let g:airline_right_sep='‹' " Slightly fancier separator, instead of '<' let g:airline_right_sep='‹' " Slightly fancier separator, instead of '<'
endif endif
" } " }

7
.vimrc.bundles
View File

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