about summary refs log tree commit diff
path: root/Src/params.c
diff options
context:
space:
mode:
authorOliver Kiddle <opk@users.sourceforge.net>2002-10-17 09:11:33 +0000
committerOliver Kiddle <opk@users.sourceforge.net>2002-10-17 09:11:33 +0000
commit35b617afb498d692729ae0689f96991c4672d822 (patch)
tree20b7896a05a820a82924db78e31e7d011a6ae3a2 /Src/params.c
parent4aea39d960ea29da0c68f9d5f8d089a9be2dafab (diff)
downloadzsh-35b617afb498d692729ae0689f96991c4672d822.tar.gz
zsh-35b617afb498d692729ae0689f96991c4672d822.tar.xz
zsh-35b617afb498d692729ae0689f96991c4672d822.zip
17794: fix bugs with tied parameters
Diffstat (limited to 'Src/params.c')
-rw-r--r--Src/params.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/Src/params.c b/Src/params.c
index f39f1012d..f461c15e0 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -2111,8 +2111,21 @@ unsetparam_pm(Param pm, int altflag, int exp)
     /* remove it under its alternate name if necessary */
     if (pm->ename && !altflag) {
 	altpm = (Param) paramtab->getnode(paramtab, pm->ename);
-	if (altpm)
+	/* tied parameters are at the same local level as each other */
+	oldpm = NULL;
+	while (altpm && altpm->level > pm->level) {
+	    /* param under alternate name hidden by a local */
+	    oldpm = altpm;
+	    altpm = altpm->old;
+	}
+	if (altpm) {
+	    if (oldpm && !altpm->level) {
+		oldpm->old = NULL;
+		/* fudge things so removenode isn't called */
+		altpm->level = 1;
+	    }
 	    unsetparam_pm(altpm, 1, exp);
+	}
     }
 
     /*