diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7d38d2242..0e7dccc72 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,6 +10,7 @@ Deprecations and removed features --------------------------------- - Fish now assumes UTF-8 everywhere, regardless of locale settings. Input bytes which are not valid UTF-8 should still be round-tripped correctly. +- On systems where no multi-byte locale is available, fish will no longer fall back to using ASCII replacements for Unicode symbols like ``…``. Interactive improvements ------------------------ diff --git a/share/tools/web_config/sample_prompts/disco.fish b/share/tools/web_config/sample_prompts/disco.fish index 8da59d83f..09cea26d2 100644 --- a/share/tools/web_config/sample_prompts/disco.fish +++ b/share/tools/web_config/sample_prompts/disco.fish @@ -8,8 +8,6 @@ function fish_prompt set -l usercolor (set_color $fish_color_user) set -l delim \U25BA - # If we don't have unicode use a simpler delimiter - string match -qi "*.utf-8" -- $LANG $LC_CTYPE $LC_ALL; or set delim ">" fish_is_root_user; and set delim "#" @@ -63,9 +61,7 @@ function fish_right_prompt set -g __fish_git_prompt_showupstream informative set -g __fish_git_prompt_showcolorhints 1 set -g __fish_git_prompt_use_informative_chars 1 - # Unfortunately this only works if we have a sensible locale - string match -qi "*.utf-8" -- $LANG $LC_CTYPE $LC_ALL - and set -g __fish_git_prompt_char_dirtystate \U1F4a9 + set -g __fish_git_prompt_char_dirtystate \U1F4a9 set -g __fish_git_prompt_char_untrackedfiles "?" # The git prompt's default format is ' (%s)'.