Skip to content

Commit 7fde9c1

Browse files
morhetzmorhetz
committed
Merge branch 'release/2.0'
2 parents deb11e6 + 6f10f00 commit 7fde9c1

File tree

3 files changed

+845
-832
lines changed

3 files changed

+845
-832
lines changed

‎autoload/airline/themes/gruvbox.vim‎

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -10,60 +10,61 @@ let g:airline#themes#gruvbox#palette = {}
1010

1111
function! airline#themes#gruvbox#refresh()
1212

13-
let M0 = airline#themes#get_highlight('Identifier')
14-
let accents_group = airline#themes#get_highlight('Special')
15-
let modified_group = [M0[0], '', M0[2], '', '']
16-
let warning_group = airline#themes#get_highlight2(['Normal', 'bg'], ['Question', 'fg'])
13+
let M0 = airline#themes#get_highlight('Identifier')
14+
let accents_group = airline#themes#get_highlight('Special')
15+
let modified_group = [M0[0], '', M0[2], '', '']
16+
let warning_group = airline#themes#get_highlight2(['Normal', 'bg'], ['Question', 'fg'])
1717

18-
let s:N1 = airline#themes#get_highlight2(['Normal', 'bg'], ['StatusLineNC', 'bg'])
19-
let s:N2 = airline#themes#get_highlight2(['StatusLineNC', 'bg'], ['StatusLineNC', 'fg'])
20-
let s:N3 = airline#themes#get_highlight2(['StatusLineNC', 'bg'], ['CursorLine', 'bg'])
21-
let g:airline#themes#gruvbox#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
22-
let g:airline#themes#gruvbox#palette.normal_modified = { 'airline_c': modified_group }
23-
let g:airline#themes#gruvbox#palette.normal.airline_warning = warning_group
24-
let g:airline#themes#gruvbox#palette.normal_modified.airline_warning = warning_group
18+
let s:N1 = airline#themes#get_highlight2(['Normal', 'bg'], ['StatusLineNC', 'bg'])
19+
let s:N2 = airline#themes#get_highlight2(['StatusLineNC', 'bg'], ['StatusLineNC', 'fg'])
20+
let s:N3 = airline#themes#get_highlight2(['StatusLineNC', 'bg'], ['CursorLine', 'bg'])
21+
let g:airline#themes#gruvbox#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
22+
let g:airline#themes#gruvbox#palette.normal_modified = { 'airline_c': modified_group }
23+
let g:airline#themes#gruvbox#palette.normal.airline_warning = warning_group
24+
let g:airline#themes#gruvbox#palette.normal_modified.airline_warning = warning_group
2525

26-
let s:I1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Identifier', 'fg'])
27-
let s:I2 = s:N2
28-
let s:I3 = airline#themes#get_highlight2(['Normal', 'fg'], ['StatusLineNC', 'fg'])
29-
let g:airline#themes#gruvbox#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
30-
let g:airline#themes#gruvbox#palette.insert_modified = g:airline#themes#gruvbox#palette.normal_modified
31-
let g:airline#themes#gruvbox#palette.insert.airline_warning = g:airline#themes#gruvbox#palette.normal.airline_warning
32-
let g:airline#themes#gruvbox#palette.insert_modified.airline_warning = g:airline#themes#gruvbox#palette.normal_modified.airline_warning
26+
let s:I1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Identifier', 'fg'])
27+
let s:I2 = s:N2
28+
let s:I3 = airline#themes#get_highlight2(['Normal', 'fg'], ['StatusLineNC', 'fg'])
29+
let g:airline#themes#gruvbox#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
30+
let g:airline#themes#gruvbox#palette.insert_modified = g:airline#themes#gruvbox#palette.normal_modified
31+
let g:airline#themes#gruvbox#palette.insert.airline_warning = g:airline#themes#gruvbox#palette.normal.airline_warning
32+
let g:airline#themes#gruvbox#palette.insert_modified.airline_warning = g:airline#themes#gruvbox#palette.normal_modified.airline_warning
3333

34-
let s:R1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Structure', 'fg'])
35-
let s:R2 = s:I2
36-
let s:R3 = s:I3
37-
let g:airline#themes#gruvbox#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
38-
let g:airline#themes#gruvbox#palette.replace_modified = g:airline#themes#gruvbox#palette.normal_modified
39-
let g:airline#themes#gruvbox#palette.replace.airline_warning = g:airline#themes#gruvbox#palette.normal.airline_warning
40-
let g:airline#themes#gruvbox#palette.replace_modified.airline_warning = g:airline#themes#gruvbox#palette.normal_modified.airline_warning
34+
let s:R1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Structure', 'fg'])
35+
let s:R2 = s:I2
36+
let s:R3 = s:I3
37+
let g:airline#themes#gruvbox#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
38+
let g:airline#themes#gruvbox#palette.replace_modified = g:airline#themes#gruvbox#palette.normal_modified
39+
let g:airline#themes#gruvbox#palette.replace.airline_warning = g:airline#themes#gruvbox#palette.normal.airline_warning
40+
let g:airline#themes#gruvbox#palette.replace_modified.airline_warning = g:airline#themes#gruvbox#palette.normal_modified.airline_warning
4141

42-
let s:V1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Question', 'fg'])
43-
let s:V2 = s:N2
44-
let s:V3 = airline#themes#get_highlight2(['Normal', 'bg'], ['TabLine', 'fg'])
45-
let g:airline#themes#gruvbox#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
46-
let g:airline#themes#gruvbox#palette.visual_modified = { 'airline_c': [ s:V3[0], '', s:V3[2], '', '' ] }
47-
let g:airline#themes#gruvbox#palette.visual.airline_warning = g:airline#themes#gruvbox#palette.normal.airline_warning
48-
let g:airline#themes#gruvbox#palette.visual_modified.airline_warning = g:airline#themes#gruvbox#palette.normal_modified.airline_warning
42+
let s:V1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Question', 'fg'])
43+
let s:V2 = s:N2
44+
let s:V3 = airline#themes#get_highlight2(['Normal', 'bg'], ['TabLine', 'fg'])
45+
let g:airline#themes#gruvbox#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
46+
let g:airline#themes#gruvbox#palette.visual_modified = { 'airline_c': [ s:V3[0], '', s:V3[2], '', '' ] }
47+
let g:airline#themes#gruvbox#palette.visual.airline_warning = g:airline#themes#gruvbox#palette.normal.airline_warning
48+
let g:airline#themes#gruvbox#palette.visual_modified.airline_warning = g:airline#themes#gruvbox#palette.normal_modified.airline_warning
4949

50-
let s:IA = airline#themes#get_highlight2(['TabLine', 'fg'], ['CursorLine', 'bg'])
51-
let g:airline#themes#gruvbox#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
52-
let g:airline#themes#gruvbox#palette.inactive_modified = { 'airline_c': modified_group }
50+
let s:IA = airline#themes#get_highlight2(['TabLine', 'fg'], ['CursorLine', 'bg'])
51+
let g:airline#themes#gruvbox#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
52+
let g:airline#themes#gruvbox#palette.inactive_modified = { 'airline_c': modified_group }
5353

54-
let g:airline#themes#gruvbox#palette.accents = { 'red': accents_group }
54+
let g:airline#themes#gruvbox#palette.accents = { 'red': accents_group }
5555

56-
let s:TF = airline#themes#get_highlight2(['Normal', 'bg'], ['Normal', 'bg'])
57-
let g:airline#themes#gruvbox#palette.tabline = {
58-
\ 'airline_tab': s:N2,
59-
\ 'airline_tabsel': s:N1,
60-
\ 'airline_tabtype': s:V1,
61-
\ 'airline_tabfill': s:TF,
62-
\ 'airline_tabhid': s:IA,
63-
\ 'airline_tabmod': s:I1
64-
\ }
56+
let s:TF = airline#themes#get_highlight2(['Normal', 'bg'], ['Normal', 'bg'])
57+
let g:airline#themes#gruvbox#palette.tabline = {
58+
\ 'airline_tab': s:N2,
59+
\ 'airline_tabsel': s:N1,
60+
\ 'airline_tabtype': s:V1,
61+
\ 'airline_tabfill': s:TF,
62+
\ 'airline_tabhid': s:IA,
63+
\ 'airline_tabmod': s:I1
64+
\ }
6565

6666
endfunction
6767

6868
call airline#themes#gruvbox#refresh()
6969

70+
" vim: set sw=2 ts=2 sts=2 et tw=80 ft=vim fdm=marker:

‎autoload/gruvbox.vim‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,35 @@
77
" -----------------------------------------------------------------------------
88

99
function! gruvbox#invert_signs_toggle()
10-
if g:gruvbox_invert_signs == 0
11-
let g:gruvbox_invert_signs=1
12-
else
13-
let g:gruvbox_invert_signs=0
14-
endif
10+
if g:gruvbox_invert_signs == 0
11+
let g:gruvbox_invert_signs=1
12+
else
13+
let g:gruvbox_invert_signs=0
14+
endif
1515

16-
colorscheme gruvbox
16+
colorscheme gruvbox
1717
endfunction
1818

1919
" Search Highlighting {{{
2020

2121
function! gruvbox#hls_show()
22-
set hlsearch
23-
call GruvboxHlsShowCursor()
22+
set hlsearch
23+
call GruvboxHlsShowCursor()
2424
endfunction
2525

2626
function! gruvbox#hls_hide()
27-
set nohlsearch
28-
call GruvboxHlsHideCursor()
27+
set nohlsearch
28+
call GruvboxHlsHideCursor()
2929
endfunction
3030

3131
function! gruvbox#hls_toggle()
32-
if &hlsearch
33-
call gruvbox#hls_hide()
34-
else
35-
call gruvbox#hls_show()
36-
endif
32+
if &hlsearch
33+
call gruvbox#hls_hide()
34+
else
35+
call gruvbox#hls_show()
36+
endif
3737
endfunction
3838

3939
" }}}
4040

41-
" vim: set sw=3 ts=3 sts=3 noet tw=80 ft=vim fdm=marker:
41+
" vim: set sw=2 ts=2 sts=2 et tw=80 ft=vim fdm=marker:

0 commit comments

Comments
 (0)