Skip to content

Commit

Permalink
Merge pull request #58 from ashfinal/master
Browse files Browse the repository at this point in the history
Add VertSplit border; Clear Folded background
  • Loading branch information
rakr authored Dec 14, 2020
2 parents 8a11166 + 3ef1d0e commit 187f5c8
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 2 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Automatic merge from upstream

on:
schedule:
# * is a special character in YAML so you have to quote this string
- cron: '0 0 * * *'

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: Sync upstream changes every day
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_ACTOR: ${{ github.actor }}
GITHUB_REPO: ${{ github.repository }}
run: |
REMOTE_REPO="rakr/vim-one"
git config user.email "[email protected]"
git config user.name "GitHub Merge Action"
git checkout master
git remote set-url origin "https://$GITHUB_ACTOR:[email protected]/$GITHUB_REPO"
git remote add upstream "https://github.com/$REMOTE_REPO"
git fetch upstream
git merge upstream/master
git remote rm upstream
git push origin HEAD:master
4 changes: 2 additions & 2 deletions colors/one.vim
Original file line number Diff line number Diff line change
Expand Up @@ -364,8 +364,8 @@ if has('gui_running') || has('termguicolors') || &t_Co == 88 || &t_Co == 256
call <sid>X('CursorLine', '', s:syntax_cursor, 'none')
call <sid>X('Directory', s:hue_2, '', '')
call <sid>X('ErrorMsg', s:hue_5, s:syntax_bg, 'none')
call <sid>X('VertSplit', s:vertsplit, '', 'none')
call <sid>X('Folded', s:syntax_bg, s:syntax_fold_bg, 'none')
call <sid>X('VertSplit', s:syntax_cursor, s:syntax_cursor, 'none')
call <sid>X('Folded', s:syntax_fg, s:syntax_bg, 'none')
call <sid>X('FoldColumn', s:mono_3, s:syntax_cursor, '')
call <sid>X('IncSearch', s:hue_6, '', '')
call <sid>X('LineNr', s:mono_4, '', '')
Expand Down

1 comment on commit 187f5c8

@laggardkernel
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems ashfinal's master branch is not clean. In this very branch, not only GH-1, GH-2 are merged, but also there's his custom github action. Suggest reverting this pr and cherry-pick 5d91c4e only.

Please sign in to comment.