diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2000-06-28 17:10:05 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2000-06-28 17:10:05 +0000 |
| commit | d38f54a92862cfc054bb11bc48066fdeba8b6106 (patch) | |
| tree | 5ff7e38d3ff274ed09056031e93a81eb34c1e573 | |
| parent | 4c7469778a16c5ce575355440ccca10fdcd8d5dc (diff) | |
| download | zsh-d38f54a92862cfc054bb11bc48066fdeba8b6106.tar.gz zsh-d38f54a92862cfc054bb11bc48066fdeba8b6106.tar.xz zsh-d38f54a92862cfc054bb11bc48066fdeba8b6106.zip | |
12112: Don't make namedirs out of hash elements.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/params.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index d4a2d5cc7..622ad7767 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2000-06-28 Bart Schaefer <schaefer@zsh.org> + + * 12112: Src/params.c: Don't make namedirs out of hash elements. + 2000-06-28 Sven Wischnowsky <wischnow@zsh.org> * 12109: Completion/Core/_complete: make _complete return the diff --git a/Src/params.c b/Src/params.c index 2768c273d..e7f5011d1 100644 --- a/Src/params.c +++ b/Src/params.c @@ -2020,6 +2020,7 @@ unsetparam_pm(Param pm, int altflag, int exp) oldpm = pm->old; paramtab->addnode(paramtab, oldpm->nam, oldpm); if ((PM_TYPE(oldpm->flags) == PM_SCALAR) && + !(pm->flags & PM_HASHELEM) && oldpm->sets.cfn == strsetfn) adduserdir(oldpm->nam, oldpm->u.str, 0, 0); if (oldpm->flags & PM_EXPORTED) { @@ -2104,7 +2105,8 @@ strsetfn(Param pm, char *x) { zsfree(pm->u.str); pm->u.str = x; - adduserdir(pm->nam, x, 0, 0); + if (!(pm->flags & PM_HASHELEM)) + adduserdir(pm->nam, x, 0, 0); } /* Function to get value of an array parameter */ |