From ca2a43f23c626b3299404af4c7121777a3f142f7 Mon Sep 17 00:00:00 2001 From: Bart Schaefer Date: Fri, 7 Apr 2017 22:35:00 -0700 Subject: [PATCH] 40940: untokenize names of condition features before attempting to look up the definition from a module. Necessary because of 40760 (tokenization of '-' as Dash). --- ChangeLog | 6 ++++++ Src/cond.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30c0e5f76..b232c16af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-04-07 Bart Schaefer + + * 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 * users/22653: Doc/Zsh/options.yo: Clarify REMATCH_PCRE diff --git a/Src/cond.c b/Src/cond.c index 9b739f6c1..a63841234 100644 --- a/Src/cond.c +++ b/Src/cond.c @@ -139,9 +139,9 @@ evalcond(Estate state, char *fromtest) l = 2; } if (name && IS_DASH(name[0])) - errname = name; + untokenize(errname = name); else if (strs[0] && IS_DASH(*strs[0])) - errname = strs[0]; + untokenize(errname = strs[0]); else errname = ""; if (name && IS_DASH(name[0]) &&