summary refs log tree commit diff
path: root/Src/Modules
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2012-10-07 19:46:46 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2012-10-07 19:46:46 +0000
commit4e2cdd795677e655f89b76b57611a196ce578432 (patch)
tree8fde8d99741f84cecb14f46f705ca1500d159af7 /Src/Modules
parent321471891e259c7b406f3cfaf1c076b28ae16a5f (diff)
downloadzsh-4e2cdd795677e655f89b76b57611a196ce578432.tar.gz
zsh-4e2cdd795677e655f89b76b57611a196ce578432.tar.xz
zsh-4e2cdd795677e655f89b76b57611a196ce578432.zip
30722: fix some cases where emulations or options were not propagated properly
from the emulate command
Diffstat (limited to 'Src/Modules')
-rw-r--r--Src/Modules/parameter.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Src/Modules/parameter.c b/Src/Modules/parameter.c
index 4d29ba635..f19dfce4f 100644
--- a/Src/Modules/parameter.c
+++ b/Src/Modules/parameter.c
@@ -771,7 +771,7 @@ setpmoption(Param pm, char *value)
 	zwarn("invalid value: %s", value);
     else if (!(n = optlookup(pm->node.nam)))
 	zwarn("no such option: %s", pm->node.nam);
-    else if (dosetopt(n, (value && strcmp(value, "off")), 0))
+    else if (dosetopt(n, (value && strcmp(value, "off")), 0, opts))
 	zwarn("can't change option: %s", pm->node.nam);
     zsfree(value);
 }
@@ -784,7 +784,7 @@ unsetpmoption(Param pm, UNUSED(int exp))
 
     if (!(n = optlookup(pm->node.nam)))
 	zwarn("no such option: %s", pm->node.nam);
-    else if (dosetopt(n, 0, 0))
+    else if (dosetopt(n, 0, 0, opts))
 	zwarn("can't change option: %s", pm->node.nam);
 }
 
@@ -812,7 +812,7 @@ setpmoptions(UNUSED(Param pm), HashTable ht)
 	    if (!val || (strcmp(val, "on") && strcmp(val, "off")))
 		zwarn("invalid value: %s", val);
 	    else if (dosetopt(optlookup(hn->nam),
-			      (val && strcmp(val, "off")), 0))
+			      (val && strcmp(val, "off")), 0, opts))
 		zwarn("can't change option: %s", hn->nam);
 	}
     deleteparamtable(ht);