aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Christian Pohle2017-05-26 10:46:52 +0200
committerMax Christian Pohle2017-05-26 10:46:52 +0200
commit8aba27d26c109f22a8801dc750c1cc5c58179364 (patch)
tree98afafca1bb86bd4fb750a7a2e927c7190bb6016
parent57bbe676ba56114d955132e38415fc5b7754bde6 (diff)
downloadvim-karlmarks-8aba27d26c109f22a8801dc750c1cc5c58179364.tar.bz2
vim-karlmarks-8aba27d26c109f22a8801dc750c1cc5c58179364.zip
Found and fixed more merge problems
-rw-r--r--vimrc-full16
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
85Plug 'godlygeek/tabular' | " align code on a sign, like :Tab/= 85Plug 'godlygeek/tabular' | " align code on a sign, like :Tab/=
86 86
87" TESTING: | " plugins which I am currently trying... 87" TESTING: | " plugins which I am currently trying...
88" Plug 'rkitover/vimpager' 88Plug 'rkitover/vimpager'
89" Plug 'Shougo/neocomplete.vim' | " alternative to YouCompleteMe in some cases 89" Plug 'Shougo/neocomplete.vim' | " alternative to YouCompleteMe in some cases
90" Plug 'tpope/vim-characterize' | " normal mode: make ga show character names of Unicode chars (ga shows hex and dec values) 90" Plug 'tpope/vim-characterize' | " normal mode: make ga show character names of Unicode chars (ga shows hex and dec values)
91 91
@@ -99,6 +99,7 @@ nnoremap <F2> :ScratchPreview<CR>
99 99
100" VIM_ROOTER: | " Unobtrusive scratch window 100" VIM_ROOTER: | " Unobtrusive scratch window
101Plug 'airblade/vim-rooter' | " makes :lcd changes to projects (git-)root (code-completion, gf, grep, find) 101Plug 'airblade/vim-rooter' | " makes :lcd changes to projects (git-)root (code-completion, gf, grep, find)
102let g:rooter_targets="/,*.c,*.h" | " only use rooter for C, not LaTeX or anything else
102 103
103" BUFEXPLORER: | " a buffer to list all buffers has the advantage, that default /-searches work in there 104" BUFEXPLORER: | " a buffer to list all buffers has the advantage, that default /-searches work in there
104Plug 'jlanzarotta/bufexplorer' 105Plug 'jlanzarotta/bufexplorer'
@@ -208,6 +209,8 @@ if has("python")
208 " YouCompleteMe: ===================================================================================================== 209 " YouCompleteMe: =====================================================================================================
209 " Plug 'Valloric/MatchTagAlways' " highlights the closing tag/brace/... 210 " Plug 'Valloric/MatchTagAlways' " highlights the closing tag/brace/...
210 Plug 'Valloric/YouCompleteMe' 211 Plug 'Valloric/YouCompleteMe'
212 Plug 'vim-scripts/dbext.vim' " dependency to allow db related completions
213 let g:ycm_server_python_interpreter = "python3"
211 let g:ycm_add_preview_to_completeopt = 1 " reuse existing preview window 214 let g:ycm_add_preview_to_completeopt = 1 " reuse existing preview window
212 let g:ycm_autoclose_preview_window_after_insertion = 1 215 let g:ycm_autoclose_preview_window_after_insertion = 1
213 let g:ycm_collect_identifiers_from_tags_files = 1 " Let YCM read tags from Ctags file 216 let g:ycm_collect_identifiers_from_tags_files = 1 " Let YCM read tags from Ctags file
@@ -221,7 +224,7 @@ if has("python")
221 let g:ycm_confirm_extra_conf = 0 " security is overrated 224 let g:ycm_confirm_extra_conf = 0 " security is overrated
222 let g:ycm_key_list_select_completion = ['<Down>'] 225 let g:ycm_key_list_select_completion = ['<Down>']
223 let g:ycm_key_list_previous_completion = ['<Up>'] 226 let g:ycm_key_list_previous_completion = ['<Up>']
224 let g:ycm_global_ycm_extra_conf = '~/src/ycm_extra_conf.py' 227 let g:ycm_global_ycm_extra_conf = '.ycm_extra_conf.py'
225 let g:ycm_semantic_triggers = { 'c': [ 're!.' ] } 228 let g:ycm_semantic_triggers = { 'c': [ 're!.' ] }
226 let g:ycm_python_binary_path = 'python' " the python interpreter of choice (for code checking) 229 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? 230 let g:ycm_disable_for_files_larger_than_kb = 16384 " we have faaast computers, don't we?
@@ -260,6 +263,12 @@ if has("python")
260 "let g:UltiSnipsJumpBackwardTrigger = '<PageUp>'| " \ 263 "let g:UltiSnipsJumpBackwardTrigger = '<PageUp>'| " \
261 "let g:UltiSnipsListSnippets = '<leader><leader>'| " YouCompleteMe includes those, so this isn't necessary 264 "let g:UltiSnipsListSnippets = '<leader><leader>'| " YouCompleteMe includes those, so this isn't necessary
262 265
266 " Plug 'rhysd/vim-clang-format'
267 Plug 'kana/vim-operator-user' " dependency, which allows overriding the = operator for indentation
268 autocmd FileType c,cpp,objc map <buffer> = :pyf /usr/share/clang/clang-format.py<CR>
269 " let g:clang_format#detect_style_file = 1
270 " autocmd FileType c,cpp,objc map <buffer> = <Plug>(operator-clang-format)
271
263 " JEDI: ============================================================================================================== 272 " JEDI: ==============================================================================================================
264 Plug 'davidhalter/jedi-vim' " jedi gets used to display python function signatures 273 Plug 'davidhalter/jedi-vim' " jedi gets used to display python function signatures
265 let g:jedi#completions_enabled = 0 " we do not need completions, because we have YouCompleteMe 274 let g:jedi#completions_enabled = 0 " we do not need completions, because we have YouCompleteMe
@@ -560,6 +569,9 @@ if has("autocmd")
560 " grep all buffers for a given string and return result in a quickfix window 569 " grep all buffers for a given string and return result in a quickfix window
561 let @q = ":cex [] | bufdo vimgrepadd /foo/g % | cw" 570 let @q = ":cex [] | bufdo vimgrepadd /foo/g % | cw"
562 571
572 " change to the current working directory
573 let @c = ":lcd %:p:h"
574
563 " exec current line as a command, insert output of command (from: https://youtu.be/MquaityA1SM?t=35m45s) 575 " exec current line as a command, insert output of command (from: https://youtu.be/MquaityA1SM?t=35m45s)
564 nnoremap Q !!$SHELL<CR> 576 nnoremap Q !!$SHELL<CR>
565 577
..