Tack-Support/powerlevel10k
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'chhschou/master' into staging_065

Browse source 
Conflicts were:
- powerlevel9k.zsh-theme and test/segments/rust_version.spec:
rust_version Segment changed (#641) on master and colors got
names (#703) on next.
This commit is contained in:
Dominik Ritter 2018-06-07 00:44:47 +02:00
commit e763fa14b0
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/segments/rust_version.spec
View file

@ -19,7 +19,8 @@ function testRust() {
alias rustc=mockRust
POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(rust_version)
assertEquals "%K{208} %F{black}Rust 0.4.1a-alpha %k%F{darkorange}%f " "$(build_left_prompt)"
assertEquals "%K{208} %F{black%}Rust%f %F{black}0.4.1a-alpha %k%F{darkorange}%f " "$(build_left_prompt)"
unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
unalias rustc