manual:9047

18 files changed, 40 insertions, 54 deletions

diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c
index acf1799f6..8356ad5a5 100644
--- a/Src/Zle/compcore.c
+++ b/Src/Zle/compcore.c
@@ -145,7 +145,7 @@ int permmnum, permgnum, lastpermmnum, lastpermgnum;
 /**/
 mod_export int nmatches;
 /**/
-int smatches;
+mod_export int smatches;
 
 /* != 0 if only explanation strings should be printed */
 
diff --git a/Src/Zle/compctl.c b/Src/Zle/compctl.c
index 69db9e04a..d13bc2252 100644
--- a/Src/Zle/compctl.c
+++ b/Src/Zle/compctl.c
@@ -3732,7 +3732,7 @@ static struct builtin bintab[] = {
 
 /**/
 int
-setup_(Module m)
+setup_compctl(Module m)
 {
     compctlreadptr = compctlread;
     createcompctltable();
@@ -3752,7 +3752,7 @@ setup_(Module m)
 
 /**/
 int
-boot_(Module m)
+boot_compctl(Module m)
 {
     addhookfunc("compctl_make", (Hookfn) ccmakehookfn);
     addhookfunc("compctl_before", (Hookfn) ccbeforehookfn);
@@ -3762,7 +3762,7 @@ boot_(Module m)
 
 /**/
 int
-cleanup_(Module m)
+cleanup_compctl(Module m)
 {
     deletehookfunc("compctl_make", (Hookfn) ccmakehookfn);
     deletehookfunc("compctl_before", (Hookfn) ccbeforehookfn);
@@ -3773,7 +3773,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_compctl(Module m)
 {
     deletehashtable(compctltab);
 
diff --git a/Src/Zle/compctl.mdd b/Src/Zle/compctl.mdd
index 6da7e002b..a76fef3a0 100644
--- a/Src/Zle/compctl.mdd
+++ b/Src/Zle/compctl.mdd
@@ -1,6 +1,4 @@
-name=zsh/compctl
-
-moddeps="zsh/complete zsh/zle"
+moddeps="complete zle"
 
 autobins="compctl"
 
diff --git a/Src/Zle/complete.c b/Src/Zle/complete.c
index bf3102972..a78a12058 100644
--- a/Src/Zle/complete.c
+++ b/Src/Zle/complete.c
@@ -1350,7 +1350,7 @@ struct hookdef comphooks[] = {
 
 /**/
 int
-setup_(Module m)
+setup_complete(Module m)
 {
     hasperm = 0;
 
@@ -1371,7 +1371,7 @@ setup_(Module m)
 
 /**/
 int
-boot_(Module m)
+boot_complete(Module m)
 {
     addhookfunc("complete", (Hookfn) do_completion);
     addhookfunc("before_complete", (Hookfn) before_complete);
@@ -1391,7 +1391,7 @@ boot_(Module m)
 
 /**/
 int
-cleanup_(Module m)
+cleanup_complete(Module m)
 {
     deletehookfunc("complete", (Hookfn) do_completion);
     deletehookfunc("before_complete", (Hookfn) before_complete);
@@ -1410,7 +1410,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_complete(Module m)
 {
     if (compwords)
 	freearray(compwords);
diff --git a/Src/Zle/complete.mdd b/Src/Zle/complete.mdd
index 8e9796d86..70e275b4e 100644
--- a/Src/Zle/complete.mdd
+++ b/Src/Zle/complete.mdd
@@ -1,8 +1,6 @@
-name=zsh/complete
+moddeps="zle"
 
-moddeps="zsh/zle"
-
-autobins="compadd compset"
+autobins="compgen compadd compset"
 
 autoprefixconds="prefix suffix between after"
 
diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c
index ce00ed240..32a2d99f3 100644
--- a/Src/Zle/complist.c
+++ b/Src/Zle/complist.c
@@ -1196,14 +1196,14 @@ menuselect(char **args)
 
 /**/
 int
-setup_(Module m)
+setup_complist(Module m)
 {
     return 0;
 }
 
 /**/
 int
-boot_(Module m)
+boot_complist(Module m)
 {
     mtab = NULL;
     mgtab = NULL;
@@ -1237,7 +1237,7 @@ boot_(Module m)
 
 /**/
 int
-cleanup_(Module m)
+cleanup_complist(Module m)
 {
     free(mtab);
     free(mgtab);
@@ -1251,7 +1251,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_complist(Module m)
 {
     return 0;
 }
diff --git a/Src/Zle/complist.mdd b/Src/Zle/complist.mdd
index a7d85fad7..4b6a5afe8 100644
--- a/Src/Zle/complist.mdd
+++ b/Src/Zle/complist.mdd
@@ -1,5 +1,3 @@
-name=zsh/complist
-
-moddeps="zsh/complete zsh/zle"
+moddeps="complete zle"
 
 objects="complist.o"
diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c
index 3bb7c60ce..9e66bab15 100644
--- a/Src/Zle/compresult.c
+++ b/Src/Zle/compresult.c
@@ -1491,7 +1491,7 @@ calclist(int showall)
 }
 
 /**/
-int asklist(void)
+mod_export int asklist(void)
 {
     /* Set the cursor below the prompt. */
     trashzle();
diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c
index 6b946de93..bb69e5bf8 100644
--- a/Src/Zle/computil.c
+++ b/Src/Zle/computil.c
@@ -2444,7 +2444,7 @@ static struct builtin bintab[] = {
 
 /**/
 int
-setup_(Module m)
+setup_computil(Module m)
 {
     memset(cadef_cache, 0, sizeof(cadef_cache));
     memset(cvdef_cache, 0, sizeof(cvdef_cache));
@@ -2458,14 +2458,14 @@ setup_(Module m)
 
 /**/
 int
-boot_(Module m)
+boot_computil(Module m)
 {
     return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
 }
 
 /**/
 int
-cleanup_(Module m)
+cleanup_computil(Module m)
 {
     deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
     return 0;
@@ -2473,7 +2473,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_computil(Module m)
 {
     int i;
 
diff --git a/Src/Zle/computil.mdd b/Src/Zle/computil.mdd
index d8190580b..cf2a13b60 100644
--- a/Src/Zle/computil.mdd
+++ b/Src/Zle/computil.mdd
@@ -1,6 +1,4 @@
-name=zsh/computil
-
-moddeps="zsh/complete zsh/zle"
+moddeps="complete zle"
 
 objects="computil.o"
 
diff --git a/Src/Zle/deltochar.c b/Src/Zle/deltochar.c
index 5badca411..e3f9def0c 100644
--- a/Src/Zle/deltochar.c
+++ b/Src/Zle/deltochar.c
@@ -75,14 +75,14 @@ deltochar(char **args)
 
 /**/
 int
-setup_(Module m)
+setup_deltochar(Module m)
 {
     return 0;
 }
 
 /**/
 int
-boot_(Module m)
+boot_deltochar(Module m)
 {
     w_deletetochar = addzlefunction("delete-to-char", deltochar,
                                     ZLE_KILL | ZLE_KEEPSUFFIX);
@@ -100,7 +100,7 @@ boot_(Module m)
 
 /**/
 int
-cleanup_(Module m)
+cleanup_deltochar(Module m)
 {
     deletezlefunction(w_deletetochar);
     deletezlefunction(w_zaptochar);
@@ -109,7 +109,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_deltochar(Module m)
 {
     return 0;
 }
diff --git a/Src/Zle/deltochar.mdd b/Src/Zle/deltochar.mdd
index 38cedb2a7..4d1f89d1c 100644
--- a/Src/Zle/deltochar.mdd
+++ b/Src/Zle/deltochar.mdd
@@ -1,5 +1,3 @@
-name=zsh/deltochar
-
-moddeps="zsh/zle"
+moddeps="zle"
 
 objects="deltochar.o"
diff --git a/Src/Zle/zle.mdd b/Src/Zle/zle.mdd
index 23292dfb3..a5307084a 100644
--- a/Src/Zle/zle.mdd
+++ b/Src/Zle/zle.mdd
@@ -1,5 +1,3 @@
-name=zsh/zle
-
 autobins="bindkey vared zle"
 
 objects="zle_bindings.o zle_hist.o zle_keymap.o zle_main.o \
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c
index 4b572be25..420494a52 100644
--- a/Src/Zle/zle_main.c
+++ b/Src/Zle/zle_main.c
@@ -1003,7 +1003,7 @@ mod_export struct hookdef zlehooks[] = {
 
 /**/
 int
-setup_(Module m)
+setup_zle(Module m)
 {
     /* Set up editor entry points */
     trashzleptr = trashzle;
@@ -1036,7 +1036,7 @@ setup_(Module m)
 
 /**/
 int
-boot_(Module m)
+boot_zle(Module m)
 {
     addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
     addhookdefs(m->nam, zlehooks, sizeof(zlehooks)/sizeof(*zlehooks));
@@ -1045,7 +1045,7 @@ boot_(Module m)
 
 /**/
 int
-cleanup_(Module m)
+cleanup_zle(Module m)
 {
     if(zleactive) {
 	zerrnam(m->nam, "can't unload the zle module while zle is active",
@@ -1059,7 +1059,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_zle(Module m)
 {
     int i;
 
diff --git a/Src/Zle/zle_thingy.c b/Src/Zle/zle_thingy.c
index 2066fe2ed..84555d20b 100644
--- a/Src/Zle/zle_thingy.c
+++ b/Src/Zle/zle_thingy.c
@@ -49,7 +49,7 @@
 /* Hashtable of thingies.  Enabled nodes are those that refer to widgets. */
 
 /**/
-HashTable thingytab;
+mod_export HashTable thingytab;
 
 /**********************************/
 /* hashtable management functions */
@@ -546,7 +546,7 @@ bin_zle_complete(char *name, char **args, char *ops, char func)
     Thingy t;
     Widget w, cw;
 
-    if (!require_module(name, "zsh/complete", 0, 0)) {
+    if (!require_module(name, "complete", 0, 0)) {
 	zerrnam(name, "can't load complete module", NULL, 0);
 	return 1;
     }
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index 264b2f06d..9d6c925b8 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -334,7 +334,7 @@ mod_export int insubscr;
 /* Parameter pointer for completing keys of an assoc array. */
 
 /**/
-Param keypm;
+mod_export Param keypm;
 
 /* 1 if we are completing in a quoted string (or inside `...`) */
 
diff --git a/Src/Zle/zleparameter.c b/Src/Zle/zleparameter.c
index d10fe99b1..c4347de6b 100644
--- a/Src/Zle/zleparameter.c
+++ b/Src/Zle/zleparameter.c
@@ -198,14 +198,14 @@ static struct pardef partab[] = {
 
 /**/
 int
-setup_(Module m)
+setup_zleparameter(Module m)
 {
     return 0;
 }
 
 /**/
 int
-boot_(Module m)
+boot_zleparameter(Module m)
 {
     struct pardef *def;
 
@@ -232,7 +232,7 @@ boot_(Module m)
 
 /**/
 int
-cleanup_(Module m)
+cleanup_zleparameter(Module m)
 {
     Param pm;
     struct pardef *def;
@@ -249,7 +249,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_zleparameter(Module m)
 {
     return 0;
 }
diff --git a/Src/Zle/zleparameter.mdd b/Src/Zle/zleparameter.mdd
index 6c88db966..d18b89662 100644
--- a/Src/Zle/zleparameter.mdd
+++ b/Src/Zle/zleparameter.mdd
@@ -1,6 +1,4 @@
-name=zsh/zleparameter
-
-moddeps="zsh/zle"
+moddeps="zle"
 
 autoparams="widgets keymaps"