Found and fixed more merge problems

1 files changed, 14 insertions, 2 deletions

diff --git a/vimrc-full b/vimrc-full
index ff8d0a3..b32d470 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -85,7 +85,7 @@ Plug 'mhinz/vim-signify'              | " uses the sign column to indicate added
 Plug 'godlygeek/tabular'              | " align code on a sign, like :Tab/=
 
 " TESTING:                            | " plugins which I am currently trying...
-" Plug 'rkitover/vimpager'
+Plug 'rkitover/vimpager'
 " Plug 'Shougo/neocomplete.vim'       | " alternative to YouCompleteMe in some cases
 " Plug 'tpope/vim-characterize'       | " normal mode: make ga show character names of Unicode chars (ga shows hex and dec values)
 
@@ -99,6 +99,7 @@ nnoremap <F2> :ScratchPreview<CR>
 
 " VIM_ROOTER:                         | " Unobtrusive scratch window
 Plug 'airblade/vim-rooter'            | " makes :lcd changes to projects (git-)root (code-completion, gf, grep, find)
+let g:rooter_targets="/,*.c,*.h"      | " only use rooter for C, not LaTeX or anything else
 
 " BUFEXPLORER:                        | " a buffer to list all buffers has the advantage, that default /-searches work in there
 Plug 'jlanzarotta/bufexplorer'
@@ -208,6 +209,8 @@ if has("python")
   " YouCompleteMe: =====================================================================================================
   " Plug 'Valloric/MatchTagAlways'                           " highlights the closing tag/brace/...
   Plug 'Valloric/YouCompleteMe'
+  Plug 'vim-scripts/dbext.vim'                       " dependency to allow db related completions
+  let g:ycm_server_python_interpreter                = "python3"
   let g:ycm_add_preview_to_completeopt               = 1   " reuse existing preview window
   let g:ycm_autoclose_preview_window_after_insertion = 1
   let g:ycm_collect_identifiers_from_tags_files      = 1   " Let YCM read tags from Ctags file
@@ -221,7 +224,7 @@ if has("python")
   let g:ycm_confirm_extra_conf                       = 0   " security is overrated
   let g:ycm_key_list_select_completion               = ['<Down>']
   let g:ycm_key_list_previous_completion             = ['<Up>']
-  let g:ycm_global_ycm_extra_conf                    = '~/src/ycm_extra_conf.py'
+  let g:ycm_global_ycm_extra_conf                    = '.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?
@@ -260,6 +263,12 @@ if has("python")
   "let g:UltiSnipsJumpBackwardTrigger = '<PageUp>'| " \
   "let g:UltiSnipsListSnippets        = '<leader><leader>'| " YouCompleteMe includes those, so this isn't necessary
 
+  " Plug 'rhysd/vim-clang-format'
+  Plug 'kana/vim-operator-user' " dependency, which allows overriding the = operator for indentation
+  autocmd FileType c,cpp,objc map <buffer> = :pyf /usr/share/clang/clang-format.py<CR>
+  " let g:clang_format#detect_style_file     = 1
+  " 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
@@ -560,6 +569,9 @@ if has("autocmd")
     " grep all buffers for a given string and return result in a quickfix window
     let @q = ":cex [] | bufdo vimgrepadd /foo/g % | cw"
 
+    " change to the current working directory
+    let @c = ":lcd %:p:h"
+
     " exec current line as a command, insert output of command (from: https://youtu.be/MquaityA1SM?t=35m45s)
     nnoremap Q !!$SHELL<CR>