aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Christian Pohle2017-05-26 10:30:55 +0200
committerMax Christian Pohle2017-05-26 10:30:55 +0200
commit57bbe676ba56114d955132e38415fc5b7754bde6 (patch)
treeeb39204c56785ad837cd0e39ed301003a170c757
parenta0bc84c10ebf79ce39b1171d8956a8eabb83d6f7 (diff)
downloadvim-57bbe676ba56114d955132e38415fc5b7754bde6.tar.bz2
vim-57bbe676ba56114d955132e38415fc5b7754bde6.zip
Messed up the merge and forgot some settings
-rw-r--r--vimrc-full5
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
57" set restorescreen | " restores the console after exiting vim 57" set restorescreen | " restores the console after exiting vim
58" set shada+=n~/.vim/shada | " shada file to use 58" set shada+=n~/.vim/shada | " shada file to use
59set scrolljump=5 | " how many lines get scrolled into view when cursor reaches the screens edge 59set scrolljump=5 | " how many lines get scrolled into view when cursor reaches the screens edge
60set scrolloff=999 | " keeps cursor centered
60set splitbelow | " open new windows below the current one (i find that more intuitive) 61set splitbelow | " open new windows below the current one (i find that more intuitive)
61set shiftround | " indent/unindent snaps to multiple of shiftwidth 62set shiftround | " indent/unindent snaps to multiple of shiftwidth
62set showcmd | " essential: show keys of combined commands in the lower right corner (BUT SLOW, makes cursor flickering) 63set 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,
159set background=light | 160set background=light |
160 161
161Plug 'vim-airline/vim-airline' | " beautification of the mode line 162Plug 'vim-airline/vim-airline' | " beautification of the mode line
162let g:airline_section_c = "" | " was: %F 163let g:airline_section_c = "%F" | " was: %F
163let g:airline_detect_modified = 1 | 164let g:airline_detect_modified = 1 |
164let g:airline_detect_paste = 0 | 165let g:airline_detect_paste = 0 |
165let g:airline_exclude_preview = 0 | 166let g:airline_exclude_preview = 0 |
@@ -223,6 +224,7 @@ if has("python")
223 let g:ycm_global_ycm_extra_conf = '~/src/ycm_extra_conf.py' 224 let g:ycm_global_ycm_extra_conf = '~/src/ycm_extra_conf.py'
224 let g:ycm_semantic_triggers = { 'c': [ 're!.' ] } 225 let g:ycm_semantic_triggers = { 'c': [ 're!.' ] }
225 let g:ycm_python_binary_path = 'python' " the python interpreter of choice (for code checking) 226 let g:ycm_python_binary_path = 'python' " the python interpreter of choice (for code checking)
227 let g:ycm_disable_for_files_larger_than_kb = 16384 " we have faaast computers, don't we?
226 228
227 " disable <tab>-key for YCM so that it can be used with ultisnips 229 " disable <tab>-key for YCM so that it can be used with ultisnips
228 let g:ycm_key_list_select_completion=[] 230 let g:ycm_key_list_select_completion=[]
@@ -306,6 +308,7 @@ function! ExtendColorTheme()
306 highlight! link TabLine LineNr 308 highlight! link TabLine LineNr
307 highlight! TabLineSel ctermbg=blue ctermfg=black 309 highlight! TabLineSel ctermbg=blue ctermfg=black
308 highlight! link TabLineFill LineNr 310 highlight! link TabLineFill LineNr
311 highlight! Search ctermbg=12 ctermfg=0
309endfunction 312endfunction
310autocmd ColorScheme * call ExtendColorTheme() 313autocmd ColorScheme * call ExtendColorTheme()
311 314
..