2 files changed, 53 insertions, 7 deletions

diff --git a/vimrc-full b/vimrc-full
index fac043b..c34cbc9 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -167,6 +167,25 @@ set laststatus=2                                        | " required by AirLine,
 set background=light                                    |
 
 Plug 'itchyny/lightline.vim'
+let g:lightline = {
+      \ 'colorscheme': 'PaperColor_light',
+      \ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" },
+      \ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" },
+      \ 'active': {
+      \   'left': [ [ 'mode', 'paste' ],
+      \             [ 'gitbranch', 'readonly' ] ],
+      \   'right': [ [ 'lineinfo' ],
+      \              [ 'percent' ],
+      \              [ 'fileformat', 'fileencoding', 'filetype', 'charvaluehex' ] ]
+      \ },
+      \ 'component_function': {
+      \   'gitbranch': 'fugitive#head'
+      \ },
+      \ 'tabline': {
+      \   'left': [ ['tabs'] ],
+      \   'right': [ [ 'close' ] ] 
+      \ }
+      \ }
 
 "    Plug 'vim-airline/vim-airline'                          | " beautification of the mode line
 "    let g:airline_section_c                          = "%F" | " was: %F
@@ -281,12 +300,12 @@ if has("python")
   " autocmd FileType c,cpp,objc map <buffer> = <Plug>(operator-clang-format)
 
   " JEDI: ==============================================================================================================
-  Plug 'davidhalter/jedi-vim'               " jedi gets used to display python function signatures
-  let g:jedi#completions_enabled        = 0 " we do not need completions, because we have YouCompleteMe
-  let g:jedi#show_call_signatures       = 1 " which sadly does not support signatures like jedi
-  let g:jedi#show_call_signatures_delay = 0
-  let g:jedi#auto_vim_configure         = 0
-  let g:pymode_rope                     = 0 " https://github.com/davidhalter/jedi-vim/issues/163
+  "     Plug 'davidhalter/jedi-vim'               " jedi gets used to display python function signatures
+  "     let g:jedi#completions_enabled        = 0 " we do not need completions, because we have YouCompleteMe
+  "     let g:jedi#show_call_signatures       = 1 " which sadly does not support signatures like jedi
+  "     let g:jedi#show_call_signatures_delay = 0
+  "     let g:jedi#auto_vim_configure         = 0
+  "     let g:pymode_rope                     = 0 " https://github.com/davidhalter/jedi-vim/issues/163
   " autocmd FileType python jedi.preload_module('os', 'sys', 'math')
   " let g:pymode_options_max_line_length          = 120
   " let g:syntastic_python_flake8_args='--ignore=F821,E302,E501,E241,E301'
@@ -664,7 +683,7 @@ highlight WordBold cterm=bold gui=bold
 let w:m1 = 0
 function! HighlightWordUnderCursor()
     if(exists('w:m1') && w:m1 > 0)
-      call matchdelete(w:m1)
+      silent! call matchdelete(w:m1)
       let w:m1 = 0
     endif
     let l:currentword = escape(expand('<cword>'), '.')
diff --git a/ycm_extra_conf.py b/ycm_extra_conf.py
index 7a1828f..3c2b399 100644
--- a/ycm_extra_conf.py
+++ b/ycm_extra_conf.py
@@ -1,3 +1,4 @@
+<<<<<<< Updated upstream
 def FlagsForFile(filename, **kwargs):
     return {
         'flags': [
@@ -19,3 +20,29 @@ def FlagsForFile(filename, **kwargs):
     }
 
 # vim:set et sw=4 ts=4 tw=120:
+=======
+import os
+import ycm_core
+
+def FlagsForFile( filename, **kwargs ):
+  return {
+    'flags': [
+      '-Wall',
+      '-Wextra',
+      '-Werror',
+      '-Wno-long-long',
+      '-Wno-variadic-macros',
+      '-fexceptions',
+      '-ferror-limit=10000',
+      '-DNDEBUG',
+      '-std=c99',
+      '-x', 'c',
+      '-D_GNU_SOURCE',
+      '-I.',
+      '-I', '/usr/include/'
+    ],
+    'do_cache': True,
+  }
+
+# vim:set et sw=2 ts=2 tw=120:
+>>>>>>> Stashed changes