From 3669415d56de9688471fdac93c10edb14967cd2f Mon Sep 17 00:00:00 2001 From: Bart Schaefer Date: Mon, 4 Sep 2000 10:15:25 +0000 Subject: Fix colors. --- ChangeLog | 3 +++ Functions/Misc/colors | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0d0970b4..bcc77e464 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-09-04 Bart Schaefer + * 12733: Functions/Misc/colors: Restore `grey' and other + accidentally-misplaced elements in the `fg*' and `bg*' arrays. + * 12732: Src/params.c: Suppress base# prefix when base is 10 even if the [##base] format of 12722 was not used. diff --git a/Functions/Misc/colors b/Functions/Misc/colors index 0a31afcf6..6778cbd49 100644 --- a/Functions/Misc/colors +++ b/Functions/Misc/colors @@ -63,17 +63,17 @@ bold_color="$lc${color[bold]}$rc" # Foreground typeset -AHg fg fg_bold fg_no_bold -for k in ${(v)color[(I)fg-*]}; do - fg[${color[$k]}]="$lc$k$rc" - fg_bold[${color[$k]}]="$lc${color[bold]};$k$rc" - fg_no_bold[${color[$k]}]="$lc${color[normal]};$k$rc" +for k in ${(k)color[(I)fg-*]}; do + fg[${k#fg-}]="$lc${color[$k]}$rc" + fg_bold[${k#fg-}]="$lc${color[bold]};${color[$k]}$rc" + fg_no_bold[${k#fg-}]="$lc${color[normal]};${color[$k]}$rc" done # Background typeset -AHg bg bg_bold bg_no_bold -for k in ${(v)color[(I)bg-*]}; do - bg[${color[$k]}]="$lc$k$rc" - bg_bold[${color[$k]}]="$lc${color[bold]};$k$rc" - bg_no_bold[${color[$k]}]="$lc${color[normal]};$k$rc" +for k in ${(k)color[(I)bg-*]}; do + bg[${k#bg-}]="$lc${color[$k]}$rc" + bg_bold[${k#bg-}]="$lc${color[bold]};${color[$k]}$rc" + bg_no_bold[${k#bg-}]="$lc${color[normal]};${color[$k]}$rc" done -- cgit 1.4.1