aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Christian Pohle2018-05-17 00:50:33 +0200
committerMax Christian Pohle2018-05-17 00:50:33 +0200
commit104b19d4703879904dffb10c5f7b019e6c297683 (patch)
treeaa97f9d2e667e7307e99ca1a12c81abab087600f
parent2d6337beaba0c6bb4e8ef818fedca564fc17064e (diff)
downloadvim-karlmarks-104b19d4703879904dffb10c5f7b019e6c297683.tar.bz2
vim-karlmarks-104b19d4703879904dffb10c5f7b019e6c297683.zip
Some minor bugfixes and a little bit more status
-rw-r--r--vimrc-full11
1 files changed, 7 insertions, 4 deletions
diff --git a/vimrc-full b/vimrc-full
index 83b5c81..4881069 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -232,7 +232,8 @@ set tags+=../tags
232" code folding... 232" code folding...
233set nofoldenable | " disable folding, because we have zi to toggle foldenable :) 233set nofoldenable | " disable folding, because we have zi to toggle foldenable :)
234set foldclose=all | " automatically fold, when the cursor leaves the folded area 234set foldclose=all | " automatically fold, when the cursor leaves the folded area
235set foldcolumn=0 | " I think I don't need this second indicator 235set foldcolumn=1 | " I think I don't need this second indicator
236set numberwidth=5
236" set foldmethod=syntax | " foldlevel: syntax, indent, manual / foldmethod=syntax makes Vim incredible slow 237" set foldmethod=syntax | " foldlevel: syntax, indent, manual / foldmethod=syntax makes Vim incredible slow
237set foldnestmax=1 | " top level folding only 238set foldnestmax=1 | " top level folding only
238set foldopen=block,hor,search | " when do we unfold? 239set foldopen=block,hor,search | " when do we unfold?
@@ -795,7 +796,7 @@ if has("python")
795 " YouCompleteMe: ===================================================================================================== 796 " YouCompleteMe: =====================================================================================================
796 " Plug 'Valloric/MatchTagAlways' " highlights the closing tag/brace/... 797 " Plug 'Valloric/MatchTagAlways' " highlights the closing tag/brace/...
797 Plug 'Valloric/YouCompleteMe', { 798 Plug 'Valloric/YouCompleteMe', {
798 \ 'do' : 'python install.py --clang-completer', 799 \ 'do' : 'python install.py --clang-completer --system-libclang --quiet',
799 \ } 800 \ }
800 let g:ycm_error_symbol = '✖' " insert this as an error symbol in the gutter bar/sign column 801 let g:ycm_error_symbol = '✖' " insert this as an error symbol in the gutter bar/sign column
801 let g:ycm_warning_symbol = '➔' " insert this as a warning symbol in the gutter bar/sign coloumn 802 let g:ycm_warning_symbol = '➔' " insert this as a warning symbol in the gutter bar/sign coloumn
@@ -998,7 +999,7 @@ function! ExtendColorTheme()
998 999
999 " autocmd InsertLeave * call matchadd('Conceal', ' \+$', -1, 101, { 'conceal': '⟶' }) 1000 " autocmd InsertLeave * call matchadd('Conceal', ' \+$', -1, 101, { 'conceal': '⟶' })
1000 autocmd InsertEnter * silent! call matchdelete(101) 1001 autocmd InsertEnter * silent! call matchdelete(101)
1001 autocmd InsertLeave * call matchadd('Convention', ' \+$', -1, 101, { 'conceal': '⟶' }) 1002 autocmd InsertLeave * silent! call matchadd('Convention', ' \+$', -1, 101, { 'conceal': '⟶' })
1002 1003
1003 " Show trailing whitepace and spaces before a tab as part of the syntax highlighting 1004 " Show trailing whitepace and spaces before a tab as part of the syntax highlighting
1004 " autocmd BufEnter,InsertLeave * syntax match Convention /\s\+$\| \+\ze\t/ containedin=ALL 1005 " autocmd BufEnter,InsertLeave * syntax match Convention /\s\+$\| \+\ze\t/ containedin=ALL
@@ -1079,7 +1080,7 @@ map <leader>h :echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")
1079if filereadable(expand("~/.vimrc_background")) && filereadable(expand("~/.config/base16-shell/colortest")) 1080if filereadable(expand("~/.vimrc_background")) && filereadable(expand("~/.config/base16-shell/colortest"))
1080 let g:base16_shell_path="~/.config/base16-shell/scripts" 1081 let g:base16_shell_path="~/.config/base16-shell/scripts"
1081 let base16colorspace=256 1082 let base16colorspace=256
1082 let syntax_cmd="skip" " vim internal, use base16 and no default colors 1083 " let syntax_cmd="skip" " vim internal, use base16 and no default colors
1083 set background=dark 1084 set background=dark
1084 source ~/.vimrc_background 1085 source ~/.vimrc_background
1085else 1086else
@@ -1153,11 +1154,13 @@ augroup status
1153 \ ."%1(%)" 1154 \ ."%1(%)"
1154 \ ."%{\ &filetype}" 1155 \ ."%{\ &filetype}"
1155 \ ."%(\ %{nr2char(0xe621)}\ %)" 1156 \ ."%(\ %{nr2char(0xe621)}\ %)"
1157 \ ."%{(&spell\ ?\ &spelllang.' '.nr2char(0xe621)\ :\ '')}"
1156 \ ."%{&fileencoding}" 1158 \ ."%{&fileencoding}"
1157 \ ."%(\ %{nr2char(0xe621)}\ %)" 1159 \ ."%(\ %{nr2char(0xe621)}\ %)"
1158 \ ."%{&fileformat}" 1160 \ ."%{&fileformat}"
1159 \ ."%(\ %{nr2char(0xe621)}\ %)" 1161 \ ."%(\ %{nr2char(0xe621)}\ %)"
1160 \ ."%4l:%-4c" 1162 \ ."%4l:%-4c"
1163 \ ."%(\ %{nr2char(0xe621)}\ %)"
1161 \ ."%-3p%%" 1164 \ ."%-3p%%"
1162 endfunction 1165 endfunction
1163 1166
..