Messed up the merge and forgot some settings

1 files changed, 4 insertions, 1 deletions

diff --git a/vimrc-full b/vimrc-full
index 6d00f7b..ff8d0a3 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -57,6 +57,7 @@ set redrawtime=400            | " The time in milliseconds for redrawing the dis
 " set restorescreen             | " restores the console after exiting vim
 " set shada+=n~/.vim/shada      | " shada file to use
 set scrolljump=5              | " how many lines get scrolled into view when cursor reaches the screens edge
+set scrolloff=999             | " keeps cursor centered
 set splitbelow                | " open new windows below the current one (i find that more intuitive)
 set shiftround                | " indent/unindent snaps to multiple of shiftwidth
 set showcmd                   | " essential: show keys of combined commands in the lower right corner (BUT SLOW, makes cursor flickering)
@@ -159,7 +160,7 @@ set laststatus=2                                        | " required by AirLine,
 set background=light                                    |
 
 Plug 'vim-airline/vim-airline'                          | " beautification of the mode line
-let g:airline_section_c                          = ""   | " was: %F
+let g:airline_section_c                          = "%F" | " was: %F
 let g:airline_detect_modified                    = 1    |
 let g:airline_detect_paste                       = 0    |
 let g:airline_exclude_preview                    = 0    |
@@ -223,6 +224,7 @@ if has("python")
   let g:ycm_global_ycm_extra_conf                    = '~/src/ycm_extra_conf.py'
   let g:ycm_semantic_triggers                        = { 'c': [ 're!.' ] }
   let g:ycm_python_binary_path                       = 'python' " the python interpreter of choice (for code checking)
+  let g:ycm_disable_for_files_larger_than_kb         = 16384 " we have faaast computers, don't we?
 
   " disable <tab>-key for YCM so that it can be used with ultisnips
   let g:ycm_key_list_select_completion=[]
@@ -306,6 +308,7 @@ function! ExtendColorTheme()
   highlight! link TabLine LineNr
   highlight! TabLineSel ctermbg=blue ctermfg=black
   highlight! link TabLineFill LineNr
+  highlight! Search ctermbg=12 ctermfg=0
 endfunction
 autocmd ColorScheme * call ExtendColorTheme()