mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-26 18:01:03 +02:00
Code Releases Activity

40940: untokenize names of condition features before attempting to look up the definition from a module.

Browse source 
Necessary because of 40760 (tokenization of '-' as Dash).
This commit is contained in:
Bart Schaefer 2017-04-07 22:35:00 -07:00
parent ce7a98fc05
commit ca2a43f23c
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2017-04-07 Bart Schaefer <schaefer@zsh.org>
* 40940: Src/cond.c: untokenize names of condition features
before attempting to look up the definition from a module.
Necessary because of 40760 (tokenization of '-' as Dash).
2017-04-05 Daniel Shahaf <d.s@daniel.shahaf.name> 2017-04-05 Daniel Shahaf <d.s@daniel.shahaf.name>
* users/22653: Doc/Zsh/options.yo: Clarify REMATCH_PCRE * users/22653: Doc/Zsh/options.yo: Clarify REMATCH_PCRE

4
Src/cond.c
View file

@ -139,9 +139,9 @@ evalcond(Estate state, char *fromtest)
l = 2; l = 2;
} }
if (name && IS_DASH(name[0])) if (name && IS_DASH(name[0]))
errname = name; untokenize(errname = name);
else if (strs[0] && IS_DASH(*strs[0])) else if (strs[0] && IS_DASH(*strs[0]))
errname = strs[0]; untokenize(errname = strs[0]);
else else
errname = "<null>"; errname = "<null>";
if (name && IS_DASH(name[0]) && if (name && IS_DASH(name[0]) &&