New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Local theme for unite.vim and matcher for tagbar #470

Closed
wants to merge 20 commits into
base: develop
from

Conversation

Projects
None yet
3 participants
@zhaocai

zhaocai commented Apr 29, 2013

Added two local themes:

The major one is for unite.vim. The other one for tagbar is trivial.

It is quite nice if you use unite.vim

unite normal
unite insert

Two much mess to separate the commits because of the json alignment conflicts for each commits. Probably merge it after the previous commits about ruby_version and syntastic.

Reference

Shougo/unite.vim#188

dhruvasagar and others added some commits Apr 20, 2013

Added Syntastic Segment.
Add a new segment to theme with name 'syntastic_segment' and it will
display the SyntasticStatuslineFlag from syntastic.

Refactored Syntastic Segment

Checking if function SyntasticStatuslineFlag exists in vim first before
getting it's value.

Refactored further
@dhruvasagar

This comment has been minimized.

Show comment
Hide comment
@dhruvasagar

dhruvasagar Apr 29, 2013

You need to look at git rebase, especially git rebase -i

dhruvasagar commented Apr 29, 2013

You need to look at git rebase, especially git rebase -i

@zhaocai

This comment has been minimized.

Show comment
Hide comment
@zhaocai

zhaocai Apr 29, 2013

@dhruvasagar thanks for the tips. what is your suggestion? should i rebase against upstream/develop?

zhaocai commented Apr 29, 2013

@dhruvasagar thanks for the tips. what is your suggestion? should i rebase against upstream/develop?

@dhruvasagar

This comment has been minimized.

Show comment
Hide comment
@dhruvasagar

dhruvasagar Apr 29, 2013

Just to make things good, you should probably create a feature branch off lokaltog/develop which doesn't have my commits and cherry-pick your commits onto it. Then send a pull request from that. I know it's a pain because changes aren't being pulled in time, but in order for things to be clean you will have to do that.

dhruvasagar commented Apr 29, 2013

Just to make things good, you should probably create a feature branch off lokaltog/develop which doesn't have my commits and cherry-pick your commits onto it. Then send a pull request from that. I know it's a pain because changes aren't being pulled in time, but in order for things to be clean you will have to do that.

@zhaocai

This comment has been minimized.

Show comment
Hide comment
@zhaocai

zhaocai Apr 29, 2013

@dhruvasagar thanks. I usually do as what you described. But this time I mixed up the commits with your commits and some of the code are shared. It is impossble to do cherry pick. The most annoying thing is the json alignment conflicts for each commits. I will have to manually copy / paste. anyway, I guess this time I will just wait a bit. Thanks anyway.

zhaocai commented Apr 29, 2013

@dhruvasagar thanks. I usually do as what you described. But this time I mixed up the commits with your commits and some of the code are shared. It is impossble to do cherry pick. The most annoying thing is the json alignment conflicts for each commits. I will have to manually copy / paste. anyway, I guess this time I will just wait a bit. Thanks anyway.

dhruvasagar and others added some commits Apr 20, 2013

Added Syntastic Segment.
Add a new segment to theme with name 'syntastic_segment' and it will
display the SyntasticStatuslineFlag from syntastic.

Refactored Syntastic Segment

Checking if function SyntasticStatuslineFlag exists in vim first before
getting it's value.

Refactored further
Merge branch 'develop' of https://github.com/Lokaltog/powerline into …
…develop

Conflicts:
	powerline/segments/vim.py
@zhaocai

This comment has been minimized.

Show comment
Hide comment
@zhaocai

zhaocai May 8, 2013

updated in a separate repo: Vim local themes for powerline

zhaocai commented May 8, 2013

updated in a separate repo: Vim local themes for powerline

@ZyX-I

This comment has been minimized.

Show comment
Hide comment
@ZyX-I

ZyX-I Jan 10, 2014

Contributor

This PR has the following issues:

  1. You have changed term_truecolor setting.
  2. unite.json has unneeded blank line.
  3. RVM/RbEnv/syntastic segments contain no vim-specific stuff and thus should be in segments/common.py.
  4. RVM/RbEnv/syntastic segments should be a separate PR since this PR header is “local theme for unite.vim and tagbar”.
  5. You committed some strange tests/git_repo file.

  1. We already have syntastic segment. Though it was added after your issue, but if you in any case have to rebase…

Closing for too much issues with the PR.

Contributor

ZyX-I commented Jan 10, 2014

This PR has the following issues:

  1. You have changed term_truecolor setting.
  2. unite.json has unneeded blank line.
  3. RVM/RbEnv/syntastic segments contain no vim-specific stuff and thus should be in segments/common.py.
  4. RVM/RbEnv/syntastic segments should be a separate PR since this PR header is “local theme for unite.vim and tagbar”.
  5. You committed some strange tests/git_repo file.

  1. We already have syntastic segment. Though it was added after your issue, but if you in any case have to rebase…

Closing for too much issues with the PR.

@ZyX-I ZyX-I closed this Jan 10, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment