2 files changed, 23 insertions, 5 deletions

diff --git a/ftplugin/doxygen.vim b/ftplugin/doxygen.vim
new file mode 100644
index 0000000..dd2cdf2
--- /dev/null
+++ b/ftplugin/doxygen.vim
@@ -0,0 +1 @@
+let g:load_doxygen_syntax=1
diff --git a/vimrc-full b/vimrc-full
index d7eb363..bf04d5e 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -192,6 +192,11 @@ set nostartofline             | " when scrolling: do not move the cursor to colu
 set nowrap                    | " but do not (by default) wrap long lines around
 set nrformats+=alpha          | " allows CTRL-A & CTRL-X to increment and decrement letters, not just numbers
 set incsearch                 | " highlight pattern while entering it (performance wise this isn't that good)
+
+if has('nvim') " Neovim?
+set inccommand=nosplit        | " preview substitute and such things in real time
+endif
+
 set pumheight=8               | " Determines the maximum number of items to show in the pop-up menu for
 set scrolljump=5              | " how many lines get scrolled into view when cursor reaches the screens edge
 set scrolloff=0               | " keeps cursor centered
@@ -647,8 +652,10 @@ vnoremap <s-up> k
 
 " close current buffer with <leader>q...
 nnoremap <leader>q :bp<bar>sp<bar>bn<bar>bd<CR>.
+" google the word under the cursor
+nnoremap <leader>G :execute ":!xdg-open https://google.de/search?q=".expand("<cword>")
 
-nnoremap <silent> <F5> :make<CR>
+nnoremap <silent> <F5> :make!<CR>
 nnoremap <silent> <F6> :silent syntax sync fromstart<CR>:nohlsearch<CR>:silent match<CR>:silent 2match<CR>:silent 3match<CR>
 nnoremap <leader>r :syntax sync fromstart
 
@@ -871,10 +878,20 @@ if has("python")
 
   if has('nvim')
     Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-    Plug 'tweekmonster/deoplete-clang2'
+    " Plug 'tweekmonster/deoplete-clang2'
     " Use deoplete.
     let g:deoplete#enable_at_startup = 1
+    inoremap <silent><expr> <C-Space> deoplete#mappings#manual_complete()
+
+    Plug 'Shougo/echodoc.vim'
+    let g:echodoc#enable_at_startup = 1
+
+    " Plug 'Rip-Rip/clang_complete'
+    Plug 'zchee/deoplete-clang'
+    Plug 'Shougo/neoinclude.vim'
+    Plug 'huawenyu/neogdb.vim'
   else
+    Plug 'idanarye/vim-vebugger'
 
     " YouCompleteMe: =====================================================================================================
     " Plug 'Valloric/MatchTagAlways'                           " highlights the closing tag/brace/...
@@ -917,13 +934,13 @@ if has("python")
   " SYNTASTIC: =========================================================================================================
   if has('nvim')
     Plug 'w0rp/ale'
+    let g:ale_set_highlights = 0
+    highlight! link ALEWarningSign FoldColumn
     let g:ale_sign_error       = ''
     let g:ale_sign_style_error = ''
     let g:ale_sign_info        = ''
-    let ale_sign_warning       = '���'
+    let g:ale_sign_warning     = '���'
   else
-
-
     Plug 'scrooloose/syntastic'
     set statusline+=%#warningmsg#
     set statusline+=%{SyntasticStatuslineFlag()}