mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 22:11:54 +02:00
Code Releases Activity

49544: only tie watch/WATCH if both come from the module

Browse source
This commit is contained in:
Oliver Kiddle 2021-11-07 12:55:27 +01:00
parent 271cfc685b
commit 631576de0f
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2021-11-07 Oliver Kiddle <opk@zsh.org>
* 49544: Src/Modules/watch.c: only tie watch/WATCH if both come
from the module
2021-11-02 Oliver Kiddle <opk@zsh.org>
* 49534, 49539: Doc/Makefile.in, Doc/Zsh/builtins.yo,

18
Src/Modules/watch.c
View file

@ -640,8 +640,8 @@ static struct builtin bintab[] = {
};
static struct paramdef partab[] = {
PARAMDEF("WATCH", PM_TIED|PM_SCALAR|PM_SPECIAL, &watch, &colonarr_gsu),
PARAMDEF("watch", PM_TIED|PM_ARRAY|PM_SPECIAL, &watch, &vararray_gsu),
PARAMDEF("WATCH", PM_SCALAR|PM_SPECIAL, &watch, &colonarr_gsu),
PARAMDEF("watch", PM_ARRAY|PM_SPECIAL, &watch, &vararray_gsu),
};
static struct features module_features = {
@ -679,12 +679,16 @@ int
boot_(UNUSED(Module m))
{
static char const * const default_watchfmt = DEFAULT_WATCHFMT;
Param pm;
if ((pm = (Param) paramtab->getnode(paramtab, "watch")))
pm->ename = "WATCH";
if ((pm = (Param) paramtab->getnode(paramtab, "WATCH")))
pm->ename = "watch";
Param pma = (Param) paramtab->getnode(paramtab, "watch");
Param pms = (Param) paramtab->getnode(paramtab, "WATCH");
if (pma && pms && pma->u.arr == watch && pms->u.arr == watch) {
/* only tie the two parameters if both were added */
pma->ename = "WATCH";
pms->ename = "watch";
pma->node.flags |= PM_TIED;
pms->node.flags |= PM_TIED;
}
watch = mkarray(NULL);
/* These two parameters are only set to defaults if not set.