From 4f0e4185b5fe3d3fd9d14e513419e96fd5e01cbb Mon Sep 17 00:00:00 2001 From: Jim Date: Fri, 31 Oct 2025 09:18:29 -0700 Subject: [PATCH] 53783: use case-insensitive search for more variants of language files --- ChangeLog | 6 ++++++ Functions/Prompts/prompt_adam1_setup | 2 +- Functions/Prompts/prompt_adam2_setup | 2 +- Functions/Prompts/prompt_special_chars | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec779c3a1..e45ac722c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2025-10-31 Bart Schaefer + + * Jim Murphy: 53783: Functions/Prompts/prompt_adam2_setup, + Functions/Prompts/prompt_special_chars: use case-insensitive + search for more variants of language files + 2025-10-31 Oliver Kiddle * LangLangbart: github #149: Completion/Darwin/Command/_say: diff --git a/Functions/Prompts/prompt_adam1_setup b/Functions/Prompts/prompt_adam1_setup index b88ffc7c1..1707d809c 100644 --- a/Functions/Prompts/prompt_adam1_setup +++ b/Functions/Prompts/prompt_adam1_setup @@ -41,7 +41,7 @@ prompt_adam1_precmd () { local prompt_length space_left base_prompt_expanded_no_color=$(print -P "$base_prompt_no_color") - base_prompt_etc=$(print -P "$base_prompt%($((${prompt_path_ellipsize_num} + 1))~|...|)%${prompt_path_ellipsize_num}~") + base_prompt_etc=$(print -P "$base_prompt_no_color%($((${prompt_path_ellipsize_num} + 1))~|...|)%${prompt_path_ellipsize_num}~") prompt_length=${#base_prompt_etc} if [[ $prompt_length -lt $prompt_wrap_length ]]; then path_prompt="%B%F{$prompt_adam1_color2}%($((${prompt_path_ellipsize_num} + 1))~|...|)%${prompt_path_ellipsize_num}~%F{white}" diff --git a/Functions/Prompts/prompt_adam2_setup b/Functions/Prompts/prompt_adam2_setup index b9445116b..41bf56fa1 100644 --- a/Functions/Prompts/prompt_adam2_setup +++ b/Functions/Prompts/prompt_adam2_setup @@ -25,7 +25,7 @@ prompt_adam2_setup () { if [[ $1 == '8bit' ]]; then shift - if [[ ${LC_ALL:-${LC_CTYPE:-$LANG}} = *UTF-8* ]]; then + if [[ ${${LC_ALL:-${LC_CTYPE:-$LANG}}:u} = *(UTF-8|UTF8)* ]]; then prompt_gfx_tlc=$'\xe2\x94\x8c' prompt_gfx_mlc=$'\xe2\x94\x9c' prompt_gfx_blc=$'\xe2\x94\x94' diff --git a/Functions/Prompts/prompt_special_chars b/Functions/Prompts/prompt_special_chars index 82a1f2d96..0586f69d7 100644 --- a/Functions/Prompts/prompt_special_chars +++ b/Functions/Prompts/prompt_special_chars @@ -8,7 +8,7 @@ typeset -gA schars -if [[ ${LC_ALL:-${LC_CTYPE:-$LANG}} = *(UTF-8|utf8)* ]]; then +if [[ ${${LC_ALL:-${LC_CTYPE:-$LANG}}:u} = *(UTF-8|UTF8)* ]]; then schars[300]=$'\xe2\x94\x94' schars[304]=$'\xe2\x94\x8c' schars[332]=$'\xe2\x94\x8c'