diff options
| author | Oliver Kiddle <opk@zsh.org> | 2021-11-30 18:36:57 +0100 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2021-11-30 18:36:57 +0100 |
| commit | ba225155e4b93b9eb0663ff5a7c260a306627dcb (patch) | |
| tree | b10f4c31f220e5c825a830dbfd567d4653fc88be | |
| parent | b3519a9603e8f7f1c9830e14f918e87daf8fea13 (diff) | |
| download | zsh-ba225155e4b93b9eb0663ff5a7c260a306627dcb.tar.gz zsh-ba225155e4b93b9eb0663ff5a7c260a306627dcb.tar.xz zsh-ba225155e4b93b9eb0663ff5a7c260a306627dcb.zip | |
49612: avoid startup error with clashing non-local module parameter name
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/module.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 20bb88d88..426bfb1e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2021-11-30 Oliver Kiddle <opk@zsh.org> + * 49612: Src/module.c: avoid startup error with clashing non-local + module parameter name + * 49611 based on 49590 (Martijn Dekker): Src/math.c: disable Inf and NaN in math expressions for sh emulation diff --git a/Src/module.c b/Src/module.c index f41b82f25..bab4d8d73 100644 --- a/Src/module.c +++ b/Src/module.c @@ -1039,7 +1039,7 @@ checkaddparam(const char *nam, int opt_i) * non-autoloadable parameter already there. This * is consistent with the way add_auto* functions work. */ - if (!opt_i || !pm->level) { + if (!opt_i || pm->level) { zwarn("Can't add module parameter `%s': %s", nam, pm->level ? "local parameter exists" : |