diff options
author | Oliver Kiddle <opk@zsh.org> | 2023-02-09 00:10:19 +0100 |
---|---|---|
committer | Oliver Kiddle <opk@zsh.org> | 2023-02-09 00:10:19 +0100 |
commit | 6502d05897a7d9441fcabfd24f203cffe4da59aa (patch) | |
tree | 2d22e60ca6103d359476f61abd092699ff633831 /Test | |
parent | d6b027c3c1203da5f3c6451bd6e2e0b81bd766b6 (diff) | |
download | zsh-6502d05897a7d9441fcabfd24f203cffe4da59aa.tar.gz zsh-6502d05897a7d9441fcabfd24f203cffe4da59aa.tar.xz zsh-6502d05897a7d9441fcabfd24f203cffe4da59aa.zip |
51320, 51383: fixes to prevent later reappearance of old attributes
Also associated test updates and a test fix for TERM=dumb.
Diffstat (limited to 'Test')
-rw-r--r-- | Test/D01prompt.ztst | 2 | ||||
-rw-r--r-- | Test/X04zlehighlight.ztst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Test/D01prompt.ztst b/Test/D01prompt.ztst index a0abb7e1d..55861cca1 100644 --- a/Test/D01prompt.ztst +++ b/Test/D01prompt.ztst @@ -261,7 +261,7 @@ A1=${(%):-%s} A2=${(%):-%u} A3=${(%):-%s%u%s} - [[ $A3 = $A1$A2 && -n $A1 && -n $A2 ]] + [[ $A3 = $A1$A2 ]] 0:Attribute optimisation - preserve initial disabling of attribute but drop useless later one : ${(%):-%K{blue}} diff --git a/Test/X04zlehighlight.ztst b/Test/X04zlehighlight.ztst index 296635bf5..87a59fde5 100644 --- a/Test/X04zlehighlight.ztst +++ b/Test/X04zlehighlight.ztst @@ -40,7 +40,7 @@ # Fix e^Mexit - match ((?)\r(?)), if \2 == \3, then replace with \2 # otherwise replace with \1 stripped out of leading/trailing [[:space:]] REPLY=${REPLY//(#b)((?(#c0,1))$cm(?(#c0,1)))/${${${(M)match[2]:#${match[3]}}:+${match[2]}}:-${${match[1]##[[:space:]]##}%%[[:space:]]##}}} - [[ -n "$REPLY" ]] && print -r -- ${${REPLY%%[[:space:]]##}##[[:space:]]##} + [[ -n "$REPLY" ]] && print -r -- ${${REPLY%%${~cm}*}##[[:space:]]##} done } zpty_stop() { |