aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore6
-rw-r--r--after/syntax/c.vim4
-rw-r--r--init.vim43
-rw-r--r--plugin/signify.vim10
4 files changed, 45 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore
index 376cb65..93df1ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,3 @@
5/spell/** 5/spell/**
6!spell/.keep 6!spell/.keep
7/systags 7/systags
8pack/_all/start/**
9pack/_all/opt/**
10pack/neovim/start/**
11pack/neovim/opt/**
12pack/vim/start/**
13pack/vim/opt/**
diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index 72136f6..301cd90 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -21,6 +21,10 @@ syntax match Comment "//.*" contains=Todo
21syn clear cBlock 21syn clear cBlock
22syn region cBlock start=/{/ end=/}/ transparent 22syn region cBlock start=/{/ end=/}/ transparent
23 23
24
25" configure c.vim so that it automatically allows doxygen like comments
26let g:load_doxygen_syntax=1
27
24" multiple single line comments in a row " broken! 28" multiple single line comments in a row " broken!
25" syn region myCComment start="/\*" end="\*/" fold keepend transparent 29" syn region myCComment start="/\*" end="\*/" fold keepend transparent
26 30
diff --git a/init.vim b/init.vim
index 8d22034..590f12b 100644
--- a/init.vim
+++ b/init.vim
@@ -1,4 +1,4 @@
1exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common' 1exec ':source '.fnamemodify($MYVIMRC,':h').'/'.'vimrc-common'
2 2
3set packpath+=pack/neovim 3set packpath+=pack/neovim
4 4
@@ -13,6 +13,34 @@ augroup DEOPLETE
13 \ 'c': ['clangd'] 13 \ 'c': ['clangd']
14 \ } 14 \ }
15 15
16
17 let g:LanguageClient_diagnosticsDisplay = {
18 \ 1: {
19 \ "name": "Error",
20 \ "texthl": "ALEError",
21 \ "signText": "✖",
22 \ "signTexthl": "ALEErrorSign",
23 \ },
24 \ 2: {
25 \ "name": "Warning",
26 \ "texthl": "ALEWarning",
27 \ "signText": "⚠",
28 \ "signTexthl": "ALEWarningSign",
29 \ },
30 \ 3: {
31 \ "name": "Information",
32 \ "texthl": "ALEInfo",
33 \ "signText": '🛈',
34 \ "signTexthl": "ALEInfoSign",
35 \ },
36 \ 4: {
37 \ "name": "Hint",
38 \ "texthl": "ALEInfo",
39 \ "signText": "➤",
40 \ "signTexthl": "ALEInfoSign",
41 \ },
42 \ }
43
16 packadd deoplete.nvim 44 packadd deoplete.nvim
17 packadd LanguageClient-neovim 45 packadd LanguageClient-neovim
18 packadd echodoc.vim 46 packadd echodoc.vim
@@ -20,14 +48,15 @@ augroup END
20 48
21"======================================================================================================================= 49"=======================================================================================================================
22augroup ALE 50augroup ALE
23 let g:ale_set_highlights = 0 51 let g:ale_set_highlights = 0
24 52
25 let g:ale_sign_error = '' 53 let g:ale_sign_error = ''
26 let g:ale_sign_style_error = '' 54 let g:ale_sign_style_error = ''
27 let g:ale_sign_info = '' 55 let g:ale_sign_info = '🛈'
28 let g:ale_sign_warning = '' 56 let g:ale_sign_warning = ''
29 57
30 highlight! link ALEWarningSign FoldColumn 58 highlight link ALEErrorSign LineNr
59 highlight link ALEWarningSign LineNr
31 60
32 packadd ale 61 packadd ale
33augroup END 62augroup END
diff --git a/plugin/signify.vim b/plugin/signify.vim
index 2ab41fe..e60cba5 100644
--- a/plugin/signify.vim
+++ b/plugin/signify.vim
@@ -13,11 +13,11 @@ augroup SIGNIFY
13 let g:signify_sign_show_count = 0 13 let g:signify_sign_show_count = 0
14 14
15 if has("multi_byte") && (&enc == 'utf-8' || &enc == 'utf-16' || &enc == 'ucs-4') 15 if has("multi_byte") && (&enc == 'utf-8' || &enc == 'utf-16' || &enc == 'ucs-4')
16 let g:signify_sign_add = '' 16 let g:signify_sign_add = ''
17 let g:signify_sign_delete = '' 17 let g:signify_sign_delete = ''
18 let g:signify_sign_delete_first_line = '' 18 let g:signify_sign_delete_first_line = ''
19 let g:signify_sign_change = '' 19 let g:signify_sign_change = ''
20 let g:signify_sign_changedelete = '' 20 let g:signify_sign_changedelete = ''
21 endif 21 endif
22 22
23 function! SignifyColorScheme() 23 function! SignifyColorScheme()
..