Skip to content

Commit 187f5c8

Browse files
authored
Merge pull request #58 from ashfinal/master
Add VertSplit border; Clear Folded background
2 parents 8a11166 + 3ef1d0e commit 187f5c8

File tree

2 files changed

+32
-2
lines changed

2 files changed

+32
-2
lines changed

.github/workflows/main.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Automatic merge from upstream
2+
3+
on:
4+
schedule:
5+
# * is a special character in YAML so you have to quote this string
6+
- cron: '0 0 * * *'
7+
8+
jobs:
9+
build:
10+
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v1
15+
- name: Sync upstream changes every day
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
GITHUB_ACTOR: ${{ github.actor }}
19+
GITHUB_REPO: ${{ github.repository }}
20+
run: |
21+
REMOTE_REPO="rakr/vim-one"
22+
git config user.email "[email protected]"
23+
git config user.name "GitHub Merge Action"
24+
git checkout master
25+
git remote set-url origin "https://$GITHUB_ACTOR:[email protected]/$GITHUB_REPO"
26+
git remote add upstream "https://github.com/$REMOTE_REPO"
27+
git fetch upstream
28+
git merge upstream/master
29+
git remote rm upstream
30+
git push origin HEAD:master

colors/one.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,8 @@ if has('gui_running') || has('termguicolors') || &t_Co == 88 || &t_Co == 256
364364
call <sid>X('CursorLine', '', s:syntax_cursor, 'none')
365365
call <sid>X('Directory', s:hue_2, '', '')
366366
call <sid>X('ErrorMsg', s:hue_5, s:syntax_bg, 'none')
367-
call <sid>X('VertSplit', s:vertsplit, '', 'none')
368-
call <sid>X('Folded', s:syntax_bg, s:syntax_fold_bg, 'none')
367+
call <sid>X('VertSplit', s:syntax_cursor, s:syntax_cursor, 'none')
368+
call <sid>X('Folded', s:syntax_fg, s:syntax_bg, 'none')
369369
call <sid>X('FoldColumn', s:mono_3, s:syntax_cursor, '')
370370
call <sid>X('IncSearch', s:hue_6, '', '')
371371
call <sid>X('LineNr', s:mono_4, '', '')

0 commit comments

Comments
 (0)