Skip to content

Commit 6c379d3

Browse files
sbennett18spf13
sbennett18
authored and
spf13
committed
Update some formatting
1 parent c6014b9 commit 6c379d3

File tree

2 files changed

+57
-58
lines changed

2 files changed

+57
-58
lines changed

‎.vimrc

Lines changed: 53 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177

178178
highlight clear LineNr " Current line number row will have same background color in relative mode.
179179
" Things like vim-gitgutter will match LineNr highlight
180-
"highlight clear CursorLineNr " Remove highlight color from current line number
180+
"highlight clear CursorLineNr " Remove highlight color from current line number
181181

182182
if has('cmdline_info')
183183
set ruler " Show the ruler
@@ -262,9 +262,9 @@
262262

263263
" Easier moving in tabs and windows
264264
" The lines conflict with the default digraph mapping of <C-K>
265-
" If you prefer that functionality, add let g:spf13_no_easyWindows = 1
266-
" in your .vimrc.before.local file
267-
265+
" If you prefer that functionality, add the following to your
266+
" .vimrc.before.local file:
267+
" let g:spf13_no_easyWindows = 1
268268
if !exists('g:spf13_no_easyWindows')
269269
map <C-J> <C-W>j<C-W>_
270270
map <C-K> <C-W>k<C-W>_
@@ -529,7 +529,7 @@
529529
"}
530530

531531
" PythonMode {
532-
" Disable if python support not present
532+
" Disable if python support not present
533533
if !has('python')
534534
let g:pymode = 1
535535
endif
@@ -576,34 +576,33 @@
576576
endif
577577
let g:neocomplete#keyword_patterns['default'] = '\h\w*'
578578

579-
" Plugin key-mappings.
580-
581-
" These two lines conflict with the default digraph mapping of <C-K>
582-
" If you prefer that functionality, add
583-
" let g:spf13_no_neosnippet_expand = 1
584-
" in your .vimrc.before.local file
585-
586-
if !exists('g:spf13_no_neosnippet_expand')
587-
imap <C-k> <Plug>(neosnippet_expand_or_jump)
588-
smap <C-k> <Plug>(neosnippet_expand_or_jump)
589-
endif
579+
" Plugin key-mappings {
580+
" These two lines conflict with the default digraph mapping of <C-K>
581+
" If you prefer that functionality, add the following to your
582+
" .vimrc.before.local file:
583+
" let g:spf13_no_neosnippet_expand = 1
584+
if !exists('g:spf13_no_neosnippet_expand')
585+
imap <C-k> <Plug>(neosnippet_expand_or_jump)
586+
smap <C-k> <Plug>(neosnippet_expand_or_jump)
587+
endif
590588

591-
inoremap <expr><C-g> neocomplete#undo_completion()
592-
inoremap <expr><C-l> neocomplete#complete_common_string()
593-
inoremap <expr><CR> neocomplete#complete_common_string()
589+
inoremap <expr><C-g> neocomplete#undo_completion()
590+
inoremap <expr><C-l> neocomplete#complete_common_string()
591+
inoremap <expr><CR> neocomplete#complete_common_string()
594592
595-
" <TAB>: completion.
596-
inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
597-
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<TAB>"
593+
" <TAB>: completion.
594+
inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
595+
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<TAB>"
598596
599-
" <CR>: close popup
600-
" <s-CR>: close popup and save indent.
601-
inoremap <expr><s-CR> pumvisible() ? neocomplete#close_popup()"\<CR>" : "\<CR>"
602-
inoremap <expr><CR> pumvisible() ? neocomplete#close_popup() : "\<CR>"
597+
" <CR>: close popup
598+
" <s-CR>: close popup and save indent.
599+
inoremap <expr><s-CR> pumvisible() ? neocomplete#close_popup()"\<CR>" : "\<CR>"
600+
inoremap <expr><CR> pumvisible() ? neocomplete#close_popup() : "\<CR>"
603601
604-
" <C-h>, <BS>: close popup and delete backword char.
605-
inoremap <expr><BS> neocomplete#smart_close_popup()."\<C-h>"
606-
inoremap <expr><C-y> neocomplete#close_popup()
602+
" <C-h>, <BS>: close popup and delete backword char.
603+
inoremap <expr><BS> neocomplete#smart_close_popup()."\<C-h>"
604+
inoremap <expr><C-y> neocomplete#close_popup()
605+
" }
607606

608607
" Enable omni completion.
609608
autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
@@ -679,34 +678,33 @@
679678
endif
680679
let g:neocomplcache_keyword_patterns._ = '\h\w*'
681680

682-
" Plugin key-mappings.
683-
684-
" These two lines conflict with the default digraph mapping of <C-K>
685-
" If you prefer that functionality, add
686-
" let g:spf13_no_neosnippet_expand = 1
687-
" in your .vimrc.before.local file
688-
689-
if !exists('g:spf13_no_neosnippet_expand')
690-
imap <C-k> <Plug>(neosnippet_expand_or_jump)
691-
smap <C-k> <Plug>(neosnippet_expand_or_jump)
692-
endif
681+
" Plugin key-mappings {
682+
" These two lines conflict with the default digraph mapping of <C-K>
683+
" If you prefer that functionality, add the following to your
684+
" .vimrc.before.local file:
685+
" let g:spf13_no_neosnippet_expand = 1
686+
if !exists('g:spf13_no_neosnippet_expand')
687+
imap <C-k> <Plug>(neosnippet_expand_or_jump)
688+
smap <C-k> <Plug>(neosnippet_expand_or_jump)
689+
endif
693690

694-
inoremap <expr><C-g> neocomplcache#undo_completion()
695-
inoremap <expr><C-l> neocomplcache#complete_common_string()
696-
inoremap <expr><CR> neocomplcache#complete_common_string()
691+
inoremap <expr><C-g> neocomplcache#undo_completion()
692+
inoremap <expr><C-l> neocomplcache#complete_common_string()
693+
inoremap <expr><CR> neocomplcache#complete_common_string()
697694
698-
" <TAB>: completion.
699-
inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
700-
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<TAB>"
695+
" <TAB>: completion.
696+
inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
697+
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<TAB>"
701698
702-
" <CR>: close popup
703-
" <s-CR>: close popup and save indent.
704-
inoremap <expr><s-CR> pumvisible() ? neocomplcache#close_popup()"\<CR>" : "\<CR>"
705-
inoremap <expr><CR> pumvisible() ? neocomplcache#close_popup() : "\<CR>"
699+
" <CR>: close popup
700+
" <s-CR>: close popup and save indent.
701+
inoremap <expr><s-CR> pumvisible() ? neocomplcache#close_popup()"\<CR>" : "\<CR>"
702+
inoremap <expr><CR> pumvisible() ? neocomplcache#close_popup() : "\<CR>"
706703
707-
" <C-h>, <BS>: close popup and delete backword char.
708-
inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"
709-
inoremap <expr><C-y> neocomplcache#close_popup()
704+
" <C-h>, <BS>: close popup and delete backword char.
705+
inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"
706+
inoremap <expr><C-y> neocomplcache#close_popup()
707+
" }
710708

711709
" Enable omni completion.
712710
autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
@@ -774,8 +772,8 @@
774772
" airline {
775773
let g:airline_theme='powerlineish' " airline users use the powerline theme
776774
if !exists('g:airline_powerline_fonts')
777-
let g:airline_left_sep='›' " Slightly fancier separator, instead of '>'
778-
let g:airline_right_sep='‹' " Slightly fancier separator, instead of '<'
775+
let g:airline_left_sep='›' " Slightly fancier separator, instead of '>'
776+
let g:airline_right_sep='‹' " Slightly fancier separator, instead of '<'
779777
endif
780778
" }
781779

‎.vimrc.bundles

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757

5858
" Bundles {
5959

60-
" Deps
60+
" Deps {
6161
Bundle 'gmarik/vundle'
6262
Bundle 'MarcWeber/vim-addon-mw-utils'
6363
Bundle 'tomtom/tlib_vim'
@@ -70,14 +70,15 @@
7070
Bundle 'mileszs/ack.vim'
7171
let g:ackprg = 'ag --nogroup --nocolor --column --smart-case'
7272
endif
73+
" }
7374

74-
" Use local bundles if available {
75+
" Use local bundles config if available {
7576
if filereadable(expand("~/.vimrc.bundles.local"))
7677
source ~/.vimrc.bundles.local
7778
endif
7879
" }
7980

80-
" Use fork bundles if available {
81+
" Use fork bundles config if available {
8182
if filereadable(expand("~/.vimrc.bundles.fork"))
8283
source ~/.vimrc.bundles.fork
8384
endif

0 commit comments

Comments
 (0)