1 files changed, 19 insertions, 14 deletions

diff --git a/vimrc-full b/vimrc-full
index 2c86fa2..c0ac443 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -739,17 +739,22 @@ nnoremap <S-PageDown> :n<CR>
 
 
 " Additional: ========================================.
-Plug 'sheerun/vim-polyglot'                   " better syntax highlighting/indentation for multiple languages
-let g:javascript_conceal_function             = "ƒ"
-let g:javascript_conceal_null                 = "ø"
-let g:javascript_conceal_this                 = "@"
-let g:javascript_conceal_return               = "⇚"
-let g:javascript_conceal_undefined            = "¿"
-let g:javascript_conceal_NaN                  = "ℕ"
-let g:javascript_conceal_prototype            = "¶"
-let g:javascript_conceal_static               = "•"
-let g:javascript_conceal_super                = "Ω"
-let g:javascript_conceal_arrow_function       = "⇒"
+" Plug 'sheerun/vim-polyglot'                   " better syntax highlighting/indentation for multiple languages
+" let g:javascript_conceal_function             = "ƒ"
+" let g:javascript_conceal_null                 = "ø"
+" let g:javascript_conceal_this                 = "@"
+" let g:javascript_conceal_return               = "⇚"
+" let g:javascript_conceal_undefined            = "¿"
+" let g:javascript_conceal_NaN                  = "ℕ"
+" let g:javascript_conceal_prototype            = "¶"
+" let g:javascript_conceal_static               = "•"
+" let g:javascript_conceal_super                = "Ω"
+" let g:javascript_conceal_arrow_function       = "⇒"
+
+
+" indent within <script> and <style> (default is a zero indent)
+let g:html_indent_script1 = "inc"
+let g:html_indent_style1 = "inc"
 
 Plug 'majutsushi/tagbar' " superseeds taglist-plus, which isn't maintained any more
 let g:tagbar_autoclose   = 0
@@ -762,7 +767,7 @@ let g:tagbar_foldlevel   = 99
 nnoremap <F9> :TagbarToggle<CR>| " bind TagBar to hotkey F9
 
 " Autocompleter: =====================================
-if has("python")
+if has("python") || has('python3')
 
   " ULTISNIPS: code snippet ============================================================================================
   Plug 'honza/vim-snippets'                      " dependency of ultisnips (see below)
@@ -801,6 +806,7 @@ if has("python")
     " let g:deoplete#sources#clang#clang_complete_database = "/home/max/src"
     " Plug 'Shougo/neoinclude.vim' " makes vim slow - unfortunatelly
 
+    " Plug 'Shougo/deoplete-clangx' " mentioned in Q&A of deoplete
     Plug 'autozimu/LanguageClient-neovim', {
           \ 'branch': 'next',
           \ 'do': 'bash install.sh',
@@ -811,8 +817,6 @@ if has("python")
           \ }
     " Plug 'roxma/nvim-completion-manager' unmaintained python version
   else
-    Plug 'idanarye/vim-vebugger'
-
     " YouCompleteMe: =====================================================================================================
     " Plug 'Valloric/MatchTagAlways'                           " highlights the closing tag/brace/...
     Plug 'Valloric/YouCompleteMe', {
@@ -825,6 +829,7 @@ if has("python")
     let g:ycm_auto_trigger                             = 1
     let g:ycm_collect_identifiers_from_tags_files      = 1   " Let YCM read tags from Ctags file
     let g:ycm_confirm_extra_conf                       = 0   " security is overrated ;)
+    let g:ycm_always_populate_location_list            = 0   " we can manually run :YcmDiags to do that
 
     let g:ycm_key_list_previous_completion             = ['Up']
     let g:ycm_key_list_select_completion               = ['Down']