Skip to content
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

Fix 256 color detection on xterm-like #6701

Merged
merged 1 commit into from
Mar 3, 2020
Merged

Fix 256 color detection on xterm-like #6701

merged 1 commit into from
Mar 3, 2020

Conversation

Shaac
Copy link
Contributor

@Shaac Shaac commented Mar 2, 2020

bbc3fec introduced a regression where support for 256 color was not
detected on xterm-like terminals that did not define the TERM_PROGRAM
env variable. Almost no terminal on linux define this variable.

Description

The upgrade from fish 3.0 to 3.1 broke the color on my terminal (kitty). Its TERM environment variable is xterm-kitty, and it does not define a TERM_PROGRAM env variable (neither do xterm, or urxvt). I changed the logic of checking for Terminal.app back to what it was before bbc3fec and fixed the problem.

TODOs:

  • Changes to fish usage are reflected in user documentation/manpages.
  • Tests have been added for regressions fixed
  • User-visible changes noted in CHANGELOG.md

bbc3fec introduced a regression where support for 256 color was not
detected on xterm-like terminals that did not define the TERM_PROGRAM
env variable. Almost no terminal on linux define this variable.
@faho faho added the regression Something that used to work, but was broken, especially between releases label Mar 3, 2020
@faho faho added this to the fish 3.1.1 milestone Mar 3, 2020
@faho faho merged commit 0fac2e0 into fish-shell:master Mar 3, 2020
@faho faho added the bug Something that's not working as intended label Mar 3, 2020
@faho
Copy link
Member

faho commented Mar 3, 2020

Thanks, nice catch. Merged to master, cherry-picked to 3.1.1 as e0645c9.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 1, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Something that's not working as intended regression Something that used to work, but was broken, especially between releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants