h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-31 12:21:19 -03:00
Code Issues Packages Projects Releases Wiki Activity

Remove hack for Terminal.app that did not support 256 colors

Browse Source 
We didn't support that version of macOS even before we bumped to
10.10.
This commit is contained in:
Aaron Gyes
2021-10-06 19:34:43 -07:00
parent 7122209f25
commit 8259bf7c7e
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/env_dispatch.cpp
View File

@@ -379,21 +379,9 @@ static void update_fish_color_support(const environment_t &vars) {
support_term256 = true;
FLOGF(term_support, L"256 color support enabled for TERM=%ls", term.c_str());
} else if (term.find(L"xterm") != wcstring::npos) {
// Assume that all 'xterm's can handle 256, except for Terminal.app from Snow Leopard
wcstring term_program;
if (auto tp = vars.get(L"TERM_PROGRAM")) term_program = tp->as_string();
if (term_program == L"Apple_Terminal") {
auto tpv = vars.get(L"TERM_PROGRAM_VERSION");
if (tpv && fish_wcstod(tpv->as_string().c_str(), nullptr) > 299) {
// OS X Lion is version 299+, it has 256 color support (see github Wiki)
support_term256 = true;
FLOGF(term_support, L"256 color support enabled for TERM=%ls on Terminal.app",
term.c_str());
}
} else {
support_term256 = true;
FLOGF(term_support, L"256 color support enabled for TERM=%ls", term.c_str());
}
// Assume that all 'xterm's can handle 25
support_term256 = true;
FLOGF(term_support, L"256 color support enabled for TERM=%ls", term.c_str());
} else if (cur_term != nullptr) {
// See if terminfo happens to identify 256 colors
support_term256 = (max_colors >= 256);