mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-06-01 04:46:08 +02:00
Code

28588: fix textual display after =~ test

This commit is contained in:
Peter Stephenson 2011-01-06 20:28:50 +00:00
parent 77281a0905
commit 020e116c54
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,8 @@
2011-01-06 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 28588: Src/text.c, Test/C02cond.ztst: fix textual display
after =~ test.
* Ben: 28574: Completion/Unix/Command/_ri: use bs formatter.
2011-01-06 Barton E. Schaefer <schaefer@zsh.org>
@ -14056,5 +14059,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5171 $
* $Revision: 1.5172 $
*****************************************************

3
Src/text.c
View File

@ -785,8 +785,7 @@ gettext2(Estate state)
taddstr(" ");
taddstr(ecgetstr(state, EC_NODUP, NULL));
if (ctype == COND_STREQ ||
ctype == COND_STRNEQ ||
ctype == COND_REGEX)
ctype == COND_STRNEQ)
state->pc++;
} else {
/* Unary test: `-f foo' etc. */

15
Test/C02cond.ztst
View File

@ -306,6 +306,21 @@ F:Failures in these cases do not indicate a problem in the shell.
2:Error message for unknown infix condition
?(eval):1: unknown condition: -fail
crashme() {
if [[ $1 =~ ^http:* ]]
then
url=${1#*=}
fi
}
which crashme
0:Regression test for examining code with regular expression match
>crashme () {
> if [[ $1 =~ ^http:* ]]
> then
> url=${1#*=}
> fi
>}
%clean
# This works around a bug in rm -f in some versions of Cygwin
chmod 644 unmodish