Skip to content

Commit

Permalink
Merge pull request spf13#449 from sbennett18/3.0
Browse files Browse the repository at this point in the history 
New spf13-vim option, formatting, solarized if statement fix
  • Loading branch information
@spf13
spf13 committed Sep 5, 2013
2 parents 05af474 + 36936db commit 3ed660a
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 62 deletions.
125 changes: 66 additions & 59 deletions .vimrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,12 @@

if filereadable(expand("~/.vim/bundle/vim-colors-solarized/colors/solarized.vim"))
let g:solarized_termcolors=256
color solarized " Load a colorscheme
endif
let g:solarized_termtrans=1
let g:solarized_contrast="high"
let g:solarized_visibility="high"
color solarized " Load a colorscheme
endif

set tabpagemax=15 " Only show 15 tabs
set showmode " Display the current mode

Expand All @@ -158,7 +159,7 @@

highlight clear LineNr " Current line number row will have same background color in relative mode.
" 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')
set ruler " Show the ruler
Expand Down Expand Up @@ -243,9 +244,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>_
Expand Down Expand Up @@ -299,8 +300,16 @@
nmap <leader>f8 :set foldlevel=8<CR>
nmap <leader>f9 :set foldlevel=9<CR>
" Toggle search highlighting
nmap <silent> <leader>/ :set invhlsearch<CR>
" Most prefer to toggle search highlighting rather than clear the current
" search results. To clear search highlighting rather than toggle it on
" and off, add the following to your .vimrc.before.local file:
" let g:spf13_clear_search_highlight = 1
if exists('g:spf13_clear_search_highlight')
nmap <silent> <leader>/ :nohlsearch<CR>
else
nmap <silent> <leader>/ :set invhlsearch<CR>
endif


" Find merge conflict markers
map <leader>fc /\v^[<\|=>]{7}( .*\|$)<CR>
Expand Down Expand Up @@ -502,7 +511,7 @@
"}

" PythonMode {
" Disable if python support not present
" Disable if python support not present
if !has('python')
let g:pymode = 1
endif
Expand Down Expand Up @@ -549,34 +558,33 @@
endif
let g:neocomplete#keyword_patterns['default'] = '\h\w*'

" Plugin key-mappings.

" These two lines conflict with the default digraph mapping of <C-K>
" If you prefer that functionality, add
" 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)
endif
" 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

inoremap <expr><C-g> neocomplete#undo_completion()
inoremap <expr><C-l> neocomplete#complete_common_string()
inoremap <expr><CR> neocomplete#complete_common_string()
inoremap <expr><C-g> neocomplete#undo_completion()
inoremap <expr><C-l> neocomplete#complete_common_string()
inoremap <expr><CR> neocomplete#complete_common_string()
" <TAB>: completion.
inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<TAB>"
" <TAB>: completion.
inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<TAB>"
" <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>"
" <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()
" <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
Expand Down Expand Up @@ -652,34 +660,33 @@
endif
let g:neocomplcache_keyword_patterns._ = '\h\w*'

" Plugin key-mappings.

" These two lines conflict with the default digraph mapping of <C-K>
" If you prefer that functionality, add
" 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)
endif
" 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

inoremap <expr><C-g> neocomplcache#undo_completion()
inoremap <expr><C-l> neocomplcache#complete_common_string()
inoremap <expr><CR> neocomplcache#complete_common_string()
inoremap <expr><C-g> neocomplcache#undo_completion()
inoremap <expr><C-l> neocomplcache#complete_common_string()
inoremap <expr><CR> neocomplcache#complete_common_string()
" <TAB>: completion.
inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<TAB>"
" <TAB>: completion.
inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<TAB>"
" <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>"
" <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()
" <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
Expand Down Expand Up @@ -747,8 +754,8 @@
" airline {
let g:airline_theme='powerlineish' " airline users use the powerline theme
if !exists('g:airline_powerline_fonts')
let g:airline_left_sep='›' " Slightly fancier separator, instead of '>'
let g:airline_right_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 '<'
endif
" }

Expand Down
7 changes: 4 additions & 3 deletions .vimrc.bundles
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

" Bundles {

" Deps
" Deps {
Bundle 'gmarik/vundle'
Bundle 'MarcWeber/vim-addon-mw-utils'
Bundle 'tomtom/tlib_vim'
Expand All @@ -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
Expand Down

0 comments on commit 3ed660a

Please sign in to comment.