about summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorTanaka Akira <akr@users.sourceforge.net>1999-08-19 11:30:30 +0000
committerTanaka Akira <akr@users.sourceforge.net>1999-08-19 11:30:30 +0000
commit5460b0d4b805b372fee95bde1abb1af144fb4960 (patch)
tree7855c65f7347607e102ebc0936ce64db822d6472 /Src
parent9867c4091e71e6ed69889a9bfaee07275d2fa04e (diff)
downloadzsh-5460b0d4b805b372fee95bde1abb1af144fb4960.tar.gz
zsh-5460b0d4b805b372fee95bde1abb1af144fb4960.tar.xz
zsh-5460b0d4b805b372fee95bde1abb1af144fb4960.zip
zsh-workers/7449
Diffstat (limited to 'Src')
-rw-r--r--Src/module.c6
-rw-r--r--Src/params.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/Src/module.c b/Src/module.c
index ce926c27a..d10206155 100644
--- a/Src/module.c
+++ b/Src/module.c
@@ -1228,8 +1228,10 @@ getconddef(int inf, char *name, int autol)
 		load_module(p->module);
 		f = 0;
 		p = NULL;
-	    } else
-		break;
+	    } else {
+		deleteconddef(p);
+		return NULL;
+	    }
 	} else
 #endif
 	    break;
diff --git a/Src/params.c b/Src/params.c
index 8cba005d4..40e427f17 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -292,6 +292,10 @@ getparamnode(HashTable ht, char *nam)
 	if (!load_module(mn))
 	    return NULL;
 	hn = gethashnode2(ht, nam);
+	if (((Param) hn) == pm) {
+	    pm->flags &= ~PM_AUTOLOAD;
+	    zwarnnam(nam, "autoload failed", NULL, 0);
+	}
     }
     return hn;
 }