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

Fix assertion error in set_color

Browse Source 
This doesn't hold for e.g. TERM=linux-m fish -c 'set_color red'
This commit is contained in:
Johannes Altmanninger
2025-05-03 12:51:49 +02:00
parent 8048e38ea4
commit c14e8c1939
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/builtins/set_color.rs
View File

@@ -3,7 +3,7 @@
use super::prelude::*; use super::prelude::*;
use crate::color::Color; use crate::color::Color;
use crate::common::str2wcstring; use crate::common::str2wcstring;
use crate::screen::is_dumb; use crate::screen::{is_dumb, only_grayscale};
use crate::terminal::{use_terminfo, Outputter}; use crate::terminal::{use_terminfo, Outputter};
use crate::text_face::{ use crate::text_face::{
self, parse_text_face_and_options, PrintColorsArgs, SpecifiedTextFace, TextFace, TextStyling, self, parse_text_face_and_options, PrintColorsArgs, SpecifiedTextFace, TextFace, TextStyling,
@@ -128,7 +128,7 @@ pub fn set_color(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -
)); ));
if specified_face.fg.is_some() && outp.contents().is_empty() { if specified_face.fg.is_some() && outp.contents().is_empty() {
assert!(is_dumb() || use_terminfo()); assert!(is_dumb() || only_grayscale() || use_terminfo());
// We need to do *something* or the lack of any output messes up // We need to do *something* or the lack of any output messes up
// when the cartesian product here would make "foo" disappear: // when the cartesian product here would make "foo" disappear:
// $ echo (set_color foo)bar // $ echo (set_color foo)bar