From 8259bf7c7eb95f5718b1bb84029c95fc36739fad Mon Sep 17 00:00:00 2001 From: Aaron Gyes Date: Wed, 6 Oct 2021 19:34:43 -0700 Subject: [PATCH] Remove hack for Terminal.app that did not support 256 colors We didn't support that version of macOS even before we bumped to 10.10. --- src/env_dispatch.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/env_dispatch.cpp b/src/env_dispatch.cpp index 9503add75..404f939bd 100644 --- a/src/env_dispatch.cpp +++ b/src/env_dispatch.cpp @@ -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);