summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Zsh/Type/_ps12346
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1cc3a831d..0de8a8511 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2020-06-11 Oliver Kiddle <okiddle@yahoo.co.uk>
+ * 46036: Completion/Zsh/Type/_ps1234: fix colouring in prompt
+ completion
+
* users/24892: Completion/Unix/Type/_files,
Completion/Zsh/Command/_zstyle: fix local declaration with
recursive-files style and complete it for zstyle
diff --git a/Completion/Zsh/Type/_ps1234 b/Completion/Zsh/Type/_ps1234
index cf1982219..0ea2cdda9 100644
--- a/Completion/Zsh/Type/_ps1234
+++ b/Completion/Zsh/Type/_ps1234
@@ -38,7 +38,7 @@ if compset -P '%[FK]'; then
)
_description -V ansi-colors expl 'ansi color'
- grp="$expl[expl[(i)-V]+1]"
+ grp="$expl[expl[(i)-J]+1]"
print -v ccol -f "($grp)=%s=%s" ${(kv)ansi}
_comp_colors+=( $ccol )
compadd "$expl[@]" $suf $pre -k ansi && ret=0
@@ -48,10 +48,10 @@ if compset -P '%[FK]'; then
(( cols = $terminfo[colors] - 1 ))
(( cols = cols > 255 ? 255 : cols ))
_description -V terminal-colors expl 'terminal color'
- grp="$expl[expl[(i)-V]+1]"
+ grp="$expl[expl[(i)-J]+1]"
compadd "$expl[@]" $suf $pre {0..$cols}
for c in {0..$cols}; do
- _comp_colors+=( "($grp)=${c}=${${$(print -P "%F{$c}")#?\[}%m}" )
+ _comp_colors+=( "($grp)=${c}=${${${(%):-%F{$c\}}#?\[}%m}" )
done
else
_message -e terminal-colors "number"