Skip to content

Commit f658976

Browse files
authored
Remove g:signify_sign_show_text (#375)
Using Unicode block characters like █ is much easier than using `g:signify_sign_show_text = 0` and creating extra highlight groups for it. Closes #374
1 parent 6b9afcc commit f658976

File tree

3 files changed

+14
-43
lines changed

3 files changed

+14
-43
lines changed

autoload/sy/highlight.vim

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,14 @@
33
scriptencoding utf-8
44

55
" Variables {{{1
6-
if get(g:, 'signify_sign_show_text', 1)
7-
let s:sign_add = get(g:, 'signify_sign_add', '+')
8-
let s:sign_delete_first_line = get(g:, 'signify_sign_delete_first_line', '')
9-
let s:sign_change = get(g:, 'signify_sign_change', '!')
10-
let s:sign_change_delete = get(g:, 'signify_sign_change_delete', s:sign_change . s:sign_delete_first_line)
11-
if strdisplaywidth(s:sign_change_delete) > 2
12-
call sy#verbose(printf('Changing g:signify_sign_change_delete from %s to !- to avoid E239', s:sign_change_delete))
13-
let s:sign_change_delete = '!-'
14-
endif
15-
else
16-
let s:sign_add = ' '
17-
let s:sign_delete_first_line = ' '
18-
let s:sign_change = ' '
19-
let s:sign_change_delete = ' '
6+
let s:sign_add = get(g:, 'signify_sign_add', '+')
7+
let s:sign_delete_first_line = get(g:, 'signify_sign_delete_first_line', '')
8+
let s:sign_change = get(g:, 'signify_sign_change', '!')
9+
let s:sign_change_delete = get(g:, 'signify_sign_change_delete', s:sign_change . s:sign_delete_first_line)
10+
if strdisplaywidth(s:sign_change_delete) > 2
11+
call sy#verbose(printf('Changing g:signify_sign_change_delete from %s to !- to avoid E239', s:sign_change_delete))
12+
let s:sign_change_delete = '!-'
2013
endif
21-
2214
let s:sign_show_count = get(g:, 'signify_sign_show_count', 1)
2315
" 1}}}
2416

autoload/sy/sign.vim

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
scriptencoding utf-8
44

55
" Variables {{{1
6-
if get(g:, 'signify_sign_show_text', 1)
7-
let s:sign_delete = get(g:, 'signify_sign_delete', '_')
8-
else
9-
let s:sign_delete = ' '
10-
endif
6+
let s:sign_delete = get(g:, 'signify_sign_delete', '_')
117

128
" Support for sign priority was added together with sign_place().
139
if exists('*sign_place')

doc/signify.txt

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ default values, as long as no "Default:" section is given.
133133
|g:signify_sign_change|
134134
|g:signify_sign_change_delete|
135135
|g:signify_sign_show_count|
136-
|g:signify_sign_show_text|
137136
|g:signify_difftool|
138137
|g:signify_fold_context|
139138
|g:signify_priority|
@@ -282,26 +281,18 @@ these.
282281
You can use Unicode characters, but signs must not take up more than two
283282
cells. Otherwise, |E239| is thrown.
284283

284+
Examples:~
285+
>
286+
let g:signify_sign_add = '▊' " U+258A LEFT THREE QUARTERS BLOCK (1 cell)
287+
let g:signify_sign_change = '██' " U+2588 FULL BLOCK x2 (2 cells)
288+
<
285289
------------------------------------------------------------------------------
286290
*g:signify_sign_show_count* >
287291
let g:signify_sign_show_count = 1
288292
<
289293
Add the number of deleted lines to |g:signify_sign_delete| (up to 99).
290294
Otherwise, only the usual sign text will be shown.
291295

292-
------------------------------------------------------------------------------
293-
*g:signify_sign_show_text* >
294-
let g:signify_sign_show_text = 1
295-
<
296-
Don't show any text in the sign column. (Actually it will show a non-breaking
297-
space.)
298-
299-
This is useful if you only want to see colors instead. If your colorscheme
300-
doesn't do it for you, you can set the background color of a particular sign
301-
yourself: |signify-colors|.
302-
303-
If you want no sign column at all and use Vim 7.4.2201+, use 'signcolumn'.
304-
305296
------------------------------------------------------------------------------
306297
*g:signify_difftool* >
307298
let g:signify_difftool = 'gnudiff'
@@ -569,20 +560,12 @@ Assuming you prefer |hl-DiffText| over |hl-DiffChange| for changed lines:
569560
>
570561
highlight link SignifyLineChange DiffText
571562
<
572-
Example configuration #1:~
563+
Example configuration:~
573564
>
574565
highlight SignifySignAdd ctermfg=green guifg=#00ff00 cterm=NONE gui=NONE
575566
highlight SignifySignDelete ctermfg=red guifg=#ff0000 cterm=NONE gui=NONE
576567
highlight SignifySignChange ctermfg=yellow guifg=#ffff00 cterm=NONE gui=NONE
577568
<
578-
Example configuration #2:~
579-
>
580-
let g:signify_sign_show_text = 0
581-
582-
highlight SignifySignAdd ctermbg=green guibg=#00ff00
583-
highlight SignifySignDelete ctermfg=black ctermbg=red guifg=#ffffff guibg=#ff0000
584-
highlight SignifySignChange ctermfg=black ctermbg=yellow guifg=#000000 guibg=#ffff00
585-
<
586569
Note: For Unix people there is a small script in the repo, showcolors.bash,
587570
that shows all 256 colors available in the terminal. That makes picking the
588571
right numbers much easier.

0 commit comments

Comments
 (0)