25095: thorough modernization of prompt theme system

1 files changed, 8 insertions, 9 deletions

diff --git a/Functions/Prompts/prompt_elite2_setup b/Functions/Prompts/prompt_elite2_setup
index 0c1500a16..68de21cc5 100644
--- a/Functions/Prompts/prompt_elite2_setup
+++ b/Functions/Prompts/prompt_elite2_setup
@@ -21,24 +21,23 @@ prompt_elite2_setup () {
   local text_col=${1:-'cyan'}
   local parens_col=${2:-$text_col}
 
-  local char_333 char_262 char_261 char_260
+  local -A schars
   autoload -U prompt_special_chars
   prompt_special_chars
 
-  local text="%{$fg_no_bold[$text_col]%}"
-  local parens="%{$fg_bold[$parens_col]%}"
-  local punct="%{$fg_bold[grey]%}"
-  local reset="%{$reset_color%}"
+  local text="%b%F{$text_col}"
+  local parens="%B%F{$parens_col}"
+  local punct="%B%F{black}"
+  local reset="%b%f"
 
   local lpar="$parens($text"
   local rpar="$parens)$text"
 
-  PS1="$punct$char_332$text$char_304$lpar%n$punct@$text%m$rpar$char_304$lpar%!$punct/$text%y$rpar$char_304$lpar%D{%I:%M%P}$punct:$text%D{%m/%d/%y}$rpar$char_304$punct-$reset$prompt_newline$punct$char_300$text$char_304$lpar%#$punct:$text%~$rpar$char_304$punct-$reset " 
+  PS1="$punct$schars[332]$text$schars[304]$lpar%n$punct@$text%m$rpar$schars[304]$lpar%!$punct/$text%y$rpar$schars[304]$lpar%D{%I:%M%P}$punct:$text%D{%m/%d/%y}$rpar$schars[304]$punct-$reset$prompt_newline$punct$schars[300]$text$schars[304]$lpar%#$punct:$text%~$rpar$schars[304]$punct-$reset " 
 
-  PS2="$parens$char_304$text$char_304$punct-$reset "
+  PS2="$parens$schars[304]$text$schars[304]$punct-$reset "
 
-  precmd () { setopt promptsubst }
-  preexec () { }
+  prompt_opts=(cr subst percent)
 }
 
 prompt_elite2_preview () {