zsh-workers/9118

26 files changed, 60 insertions, 53 deletions

diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index 6bef21179..c8c07b2f4 100644
--- a/Doc/Makefile.in
+++ b/Doc/Makefile.in
@@ -169,31 +169,38 @@ version.yo: $(sdir_top)/Config/version.mk
 
 Zsh/modlist.yo: $(MODDOCSRC)
 	( \
-	    modules=`echo '' $(MODDOCSRC) '' | sed 's| Zsh/mod_| |g;s|\.yo | |g'`; \
 	    echo "startitem()"; \
-	    for mod in $$modules; do \
-		echo "item(tt(zsh/$$mod))("; \
-		sed -n '1d;/^!MOD!)$$/q;p' < $(sdir)/Zsh/mod_$${mod}.yo; \
+	    for modfile in $(MODDOCSRC); do \
+		sed -n '1{s|^COMMENT(!MOD!\(.*\)$$|item(tt(\1))(|;p;d;};/^!MOD!)$$/q;p' \
+		    < $(sdir)/$$modfile; \
 		echo ")"; \
 	    done; \
 	    echo "enditem()"; \
 	    echo "startmenu()"; \
 	    echo "includefile(Zsh/modmenu.yo)
"; \
 	    echo "endmenu()"; \
-	    set '' $$modules; \
+	    set '' $(MODDOCSRC); \
+	    unset mod1 mod2 mod3; \
+	    test ".$$2" != . && \
+		mod2=`sed -n '1{s|^COMMENT(!MOD!||;p;q;}' < $(sdir)/$$2`; \
 	    while test ".$$2" != .; do \
-		echo "texinode(The zsh/$$2 Module)($${3+The $$3 Module})($${1:+The $$1 Module})(Zsh Modules)"; \
-		echo "sect(The zsh/$$2 Module)"; \
-		echo "includefile(Zsh/mod_$${2}.yo)
"; \
+		unset mod3; \
+		test ".$$3" != . && \
+		    mod3=`sed -n '1{s|^COMMENT(!MOD!||;p;q;}' < $(sdir)/$$3`; \
+		echo "texinode(The $$mod2 Module)($${mod3+The $$mod3 Module})($${mod1:+The $$mod1 Module})(Zsh Modules)"; \
+		echo "sect(The $$mod2 Module)"; \
+		echo "includefile($${2})
"; \
 		shift; \
+		mod1=$$mod2; \
+		mod2=$$mod3; \
 	    done \
 	) > $(sdir)/Zsh/modlist.yo
 
 Zsh/modmenu.yo: $(MODDOCSRC)
 	( \
-	    modules=`echo '' $(MODDOCSRC) '' | sed 's| Zsh/mod_| |g;s|\.yo | |g'`; \
-	    for mod in $$modules; do \
-		echo "menu(The zsh/$$mod Module)"; \
+	    for modfile in $(MODDOCSRC); do \
+		sed -n '1{s|^COMMENT(!MOD!\(.*\)$$|menu(The \1 Module)|;p;q;}' \
+		    < $(sdir)/$$modfile; \
 	    done \
 	) > $(sdir)/Zsh/modmenu.yo
 
diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo
index 9513eb22c..a46ec0f92 100644
--- a/Doc/Zsh/builtins.yo
+++ b/Doc/Zsh/builtins.yo
@@ -613,7 +613,7 @@ item(tt(-b))(
 Recognize all the escape sequences defined for the tt(bindkey) command,
 see 
 ifzman(zmanref(zshmodules))\
-ifnzman(noderef(The zle Module))\
+ifnzman(noderef(The zsh/zle Module))\
 .
 )
 item(tt(-m))(
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index 42c2bf000..7a5ece99a 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -166,7 +166,7 @@ tt(expand-or-complete-prefix), tt(list-choices), tt(menu-complete),
 tt(menu-expand-or-complete), or tt(reverse-menu-complete). If the
 tt(complist) module is loaded (see
 ifzman(zmanref(zshmodules))\
-ifnzman(noderef(The complist Module))\
+ifnzman(noderef(The zsh/complist Module))\
 ), the tt(menu-select) widget can be used, too.  Note that the
 bindings will not be used if the key is already bound (that
 is, is bound to something other than tt(undefined-key)).
@@ -244,7 +244,7 @@ the var(style) argument. The widgets usable for this are:
 tt(complete-word), tt(delete-char-or-list), tt(expand-or-complete),
 tt(expand-or-complete-prefix), tt(list-choices), tt(menu-complete),
 tt(menu-expand-or-complete), and tt(reverse-menu-complete), as well as
-tt(menu-select) if the tt(complist) module is loaded.  The option tt(-n)
+tt(menu-select) if the tt(zsh/complist) module is loaded.  The option tt(-n)
 prevents the key being bound if it is already to bound to something other
 than tt(undefined-key).
 
@@ -324,7 +324,7 @@ Completion behaviour can be modified by various other
 `styles' defined with the tt(zstyle) builtin command
 (see
 ifzman(zmanref(zshmodules))\
-ifnzman(noderef(The zutil Module))).
+ifnzman(noderef(The zsh/zutil Module))).
 The full context used in looking up styles is the prefix `tt(:completion)'
 followed by the context as described above, followed by another colon and
 the name of the tag currently being tried for completion.
@@ -711,7 +711,7 @@ is used.
 )
 item(tt(disable-stat))(
 This is used with the tt(cvs) tag by the function completing for the
-tt(cvs) command to decide if the tt(stat) module should be used to
+tt(cvs) command to decide if the tt(zsh/stat) module should be used to
 generate only names of modified files in the appropriate places.
 )
 item(tt(expand))(
@@ -756,7 +756,7 @@ sequences, the `tt(%)' may be followed by field with specifications as
 described for the tt(zformat) builtin command from the tt(zutil)
 module, see
 ifzman(zmanref(zshmodules))\
-ifnzman(noderef(The zutil Module))\
+ifnzman(noderef(The zsh/zutil Module))\
 .
 )
 item(tt(glob))(
@@ -909,11 +909,11 @@ Like the tt(arguments) style, but used when calling the tt(ps) command
 to generate the list to display.
 )
 item(tt(list-colors))(
-If the tt(complist) module is used, this style can be used to set
+If the tt(zsh/complist) module is used, this style can be used to set
 color specifications as with the tt(ZLS_COLORS) and tt(ZLS_COLOURS)
 parameters (see
-ifzman(the section `The complist Module' in zmanref(zshmodules))\
-ifnzman(noderef(The complist Module))\
+ifzman(the section `The zsh/complist Module' in zmanref(zshmodules))\
+ifnzman(noderef(The zsh/complist Module))\
 ).
 
 If this style is set for the tt(default) tag, the strings in the value 
@@ -992,7 +992,7 @@ override the value set for the tt(default) tag.
 Either instead of or in addition to one of the values above, the value
 for this style may also contain the string tt(select), optionally
 followed by an equal sign and a number. In this case menuselection
-(as defined by the tt(computil) module) will be started. Without the
+(as defined by the tt(zsh/computil) module) will be started. Without the
 optional number, it will be started unconditionally and with a number
 it will be started only if at least that many matches are generated
 (if the values for more than one tag defines such a number, the
@@ -2355,7 +2355,7 @@ example(_sort_tags() {
 })
 
 Every call to the tt(comptry) function (actually a builtin
-command defined by the tt(computil) module) gives a
+command defined by the tt(zsh/computil) module) gives a
 set of tags to use; as soon as tt(comptry) produces some matches,
 subsequent calls have no effect.  Hence in the example
 this means that for the tt(dvips) command on the first attempt the
diff --git a/Doc/Zsh/compwid.yo b/Doc/Zsh/compwid.yo
index f383bb595..4e31c743e 100644
--- a/Doc/Zsh/compwid.yo
+++ b/Doc/Zsh/compwid.yo
@@ -5,15 +5,15 @@ cindex(completion, programmable)
 cindex(completion, controlling)
 sect(Description)
 Completion widgets are defined by the tt(-C) option to the tt(zle)
-builtin command provided by the tt(zle) module (see
+builtin command provided by the tt(zsh/zle) module (see
 ifzman(zmanref(zshzle))\
-ifnzman(noderef(The zle Module))\
+ifnzman(noderef(The zsh/zle Module))\
 ). For example,
 
 example(zle -C complete expand-or-complete completer)
 
 defines a widget named tt(complete). When this widget is bound to a key
-using the tt(bindkey) builtin command defined in the tt(zle) module
+using the tt(bindkey) builtin command defined in the tt(zsh/zle) module
 (see 
 ifzman(zmanref(zshzle))\
 ifnzman(noderef(Zsh Line Editor))\
@@ -706,7 +706,7 @@ The return value can be used to test if a matching tt(compctl)
 definition was found. It is non-zero if a tt(compctl) was found and
 zero otherwise.
 
-Note that this builtin is defined by the tt(compctl) module.
+Note that this builtin is defined by the tt(zsh/compctl) module.
 )
 enditem()
 
diff --git a/Doc/Zsh/mod_cap.yo b/Doc/Zsh/mod_cap.yo
index 3dec78b00..2db811cdc 100644
--- a/Doc/Zsh/mod_cap.yo
+++ b/Doc/Zsh/mod_cap.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/cap
 Builtins for manipulating POSIX.1e (POSIX.6) capability (privilege) sets.
 !MOD!)
 The tt(zsh/cap) module is used for manipulating POSIX.1e (POSIX.6) capability
diff --git a/Doc/Zsh/mod_clone.yo b/Doc/Zsh/mod_clone.yo
index 9dd710cca..510a16a7d 100644
--- a/Doc/Zsh/mod_clone.yo
+++ b/Doc/Zsh/mod_clone.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/clone
 A builtin that can clone a running shell onto another terminal.
 !MOD!)
 The tt(zsh/clone) module makes available one builtin command:
diff --git a/Doc/Zsh/mod_compctl.yo b/Doc/Zsh/mod_compctl.yo
index 5dfa880a4..ad8b75cff 100644
--- a/Doc/Zsh/mod_compctl.yo
+++ b/Doc/Zsh/mod_compctl.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/compctl
 The tt(compctl) builtin for controlling completion.
 !MOD!)
 The tt(zsh/compctl) module makes available two builtin commands. tt(compctl),
diff --git a/Doc/Zsh/mod_complete.yo b/Doc/Zsh/mod_complete.yo
index 18f4f8ebc..e1c377666 100644
--- a/Doc/Zsh/mod_complete.yo
+++ b/Doc/Zsh/mod_complete.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/complete
 The basic completion code.
 !MOD!)
 The tt(zsh/complete) module makes available several builtin commands which
diff --git a/Doc/Zsh/mod_complist.yo b/Doc/Zsh/mod_complist.yo
index c5fa9fac1..f1804ffc3 100644
--- a/Doc/Zsh/mod_complist.yo
+++ b/Doc/Zsh/mod_complist.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/complist
 Completion listing extensions.
 !MOD!)
 cindex(completion, listing)
@@ -205,7 +205,7 @@ have sensible default (namely the cursor keys, return, and TAB). However,
 keys in the the tt(menuselect) keymap can be modified directly using the
 tt(bindkey) builtin command (see
 ifzman(zmanref(zshmodules))\
-ifnzman(noderef(The zle Module))\
+ifnzman(noderef(The zsh/zle Module))\
 ). For example, to make the return key leave menu-selection and
 continue with normal menu-completion one can call
 
diff --git a/Doc/Zsh/mod_computil.yo b/Doc/Zsh/mod_computil.yo
index 26a8d25eb..b2df4e257 100644
--- a/Doc/Zsh/mod_computil.yo
+++ b/Doc/Zsh/mod_computil.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/computil
 A module with utility builtins needed for the shell function based
 completion system.
 !MOD!)
diff --git a/Doc/Zsh/mod_deltochar.yo b/Doc/Zsh/mod_deltochar.yo
index 334babbde..77f05b9c3 100644
--- a/Doc/Zsh/mod_deltochar.yo
+++ b/Doc/Zsh/mod_deltochar.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/deltochar
 A ZLE function duplicating EMACS' tt(zap-to-char).
 !MOD!)
 The tt(zsh/deltochar) module makes available two ZLE functions:
diff --git a/Doc/Zsh/mod_example.yo b/Doc/Zsh/mod_example.yo
index 03b795bc0..af6d53b88 100644
--- a/Doc/Zsh/mod_example.yo
+++ b/Doc/Zsh/mod_example.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/example
 An example of how to write a module.
 !MOD!)
 The tt(zsh/example) module makes available one builtin command:
diff --git a/Doc/Zsh/mod_files.yo b/Doc/Zsh/mod_files.yo
index 10e9123ff..db45923c7 100644
--- a/Doc/Zsh/mod_files.yo
+++ b/Doc/Zsh/mod_files.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/files
 Some basic file manipulation commands as builtins.
 !MOD!)
 cindex(files, manipulating)
diff --git a/Doc/Zsh/mod_mapfile.yo b/Doc/Zsh/mod_mapfile.yo
index d3dd2a041..496d8a915 100644
--- a/Doc/Zsh/mod_mapfile.yo
+++ b/Doc/Zsh/mod_mapfile.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/mapfile
 Access to external files via a special associative array.
 !MOD!)
 cindex(parameter, file access via)
diff --git a/Doc/Zsh/mod_mathfunc.yo b/Doc/Zsh/mod_mathfunc.yo
index 2c87e873f..720db6d28 100644
--- a/Doc/Zsh/mod_mathfunc.yo
+++ b/Doc/Zsh/mod_mathfunc.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/mathfunc
 Standard scientific functions for use in mathematical evaluations.
 !MOD!)
 cindex(functions, mathematical)
diff --git a/Doc/Zsh/mod_parameter.yo b/Doc/Zsh/mod_parameter.yo
index 6d58dd8f0..8e34130d1 100644
--- a/Doc/Zsh/mod_parameter.yo
+++ b/Doc/Zsh/mod_parameter.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/parameter
 Access to internal hash tables via special associative arrays.
 !MOD!)
 cindex(parameters, special)
diff --git a/Doc/Zsh/mod_sched.yo b/Doc/Zsh/mod_sched.yo
index faf94cbcc..f1839be33 100644
--- a/Doc/Zsh/mod_sched.yo
+++ b/Doc/Zsh/mod_sched.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/sched
 A builtin that provides a timed execution facility within the shell.
 !MOD!)
 The tt(zsh/sched) module makes available one builtin command:
diff --git a/Doc/Zsh/mod_stat.yo b/Doc/Zsh/mod_stat.yo
index 0d2f709db..ea261eba2 100644
--- a/Doc/Zsh/mod_stat.yo
+++ b/Doc/Zsh/mod_stat.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/stat
 A builtin command interface to the tt(stat) system call.
 !MOD!)
 The tt(zsh/stat) module makes available one builtin command:
diff --git a/Doc/Zsh/mod_zftp.yo b/Doc/Zsh/mod_zftp.yo
index 708122bd8..55f08bedd 100644
--- a/Doc/Zsh/mod_zftp.yo
+++ b/Doc/Zsh/mod_zftp.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/zftp
 A builtin FTP client.
 !MOD!)
 The tt(zsh/zftp) module makes available one builtin command:
diff --git a/Doc/Zsh/mod_zle.yo b/Doc/Zsh/mod_zle.yo
index 0230dcaad..f7a4a5a7d 100644
--- a/Doc/Zsh/mod_zle.yo
+++ b/Doc/Zsh/mod_zle.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/zle
 The Zsh Line Editor, including the tt(bindkey) and tt(vared) builtins.
 !MOD!)
 The tt(zsh/zle) module contains the Zsh Line Editor.  See
diff --git a/Doc/Zsh/mod_zleparameter.yo b/Doc/Zsh/mod_zleparameter.yo
index 287e3bdb3..03d504724 100644
--- a/Doc/Zsh/mod_zleparameter.yo
+++ b/Doc/Zsh/mod_zleparameter.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/zleparameter
 Access to internals of the Zsh Line Editor via parameters.
 !MOD!)
 cindex(parameters, special)
diff --git a/Doc/Zsh/mod_zprof.yo b/Doc/Zsh/mod_zprof.yo
index 17add53b8..be9d1b83e 100644
--- a/Doc/Zsh/mod_zprof.yo
+++ b/Doc/Zsh/mod_zprof.yo
@@ -1,8 +1,8 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/zprof
 A module allowing profiling for shell functions.
 !MOD!)
 cindex(functions, profiling)
-When loaded, the tt(zprof) module makes shell functions be
+When loaded, the tt(zsh/zprof) module makes shell functions be
 profiled. The profiling results can be obtained with the tt(zprof)
 builtin command made available by this module. There is no way to turn 
 profiling off other than unloading this module.
@@ -53,7 +53,7 @@ For the calling and the called functions, the column showing the
 number of calls to a function also show the total number of
 invocations made to the called function after a slash.
 
-As long as the tt(zprof) module is loaded, profiling will be done and
+As long as the tt(zsh/zprof) module is loaded, profiling will be done and
 multiple invocations of the tt(zprof) builtin command will show the
 times and numbers of calls since the module was loaded. With the
 tt(-c) option, the tt(zprof) builtin command will reset its internal
diff --git a/Doc/Zsh/mod_zutil.yo b/Doc/Zsh/mod_zutil.yo
index 2232551fe..d6196d7ed 100644
--- a/Doc/Zsh/mod_zutil.yo
+++ b/Doc/Zsh/mod_zutil.yo
@@ -1,4 +1,4 @@
-COMMENT(!MOD!
+COMMENT(!MOD!zsh/zutil
 Some utility builtins, e.g. the one for supporting configuration via 
 styles.
 !MOD!)
diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo
index 5bb8b9e6e..f819aaecd 100644
--- a/Doc/Zsh/params.yo
+++ b/Doc/Zsh/params.yo
@@ -910,8 +910,8 @@ vindex(ZBEEP)
 item(tt(ZBEEP))(
 If set, this gives a string of characters, which can use all the same codes
 as the tt(bindkey) command as described in
-ifzman(the zle module entry in zmanref(zshmodules))\
-ifnzman(noderef(The zle Module))\
+ifzman(the zsh/zle module entry in zmanref(zshmodules))\
+ifnzman(noderef(The zsh/zle Module))\
 , that will be output to the terminal
 instead of beeping.  This may have a visible instead of an audible effect;
 for example, the string `tt(\e[?5h\e[?5l)' on a vt100 or xterm will have
diff --git a/Doc/Zsh/zftpsys.yo b/Doc/Zsh/zftpsys.yo
index fa50fd15e..643aa6ac2 100644
--- a/Doc/Zsh/zftpsys.yo
+++ b/Doc/Zsh/zftpsys.yo
@@ -18,7 +18,7 @@ ifzman(\
 zmanref(zshmodules)
 )\
 ifnzman(\
-noderef(The zftp Module)
+noderef(The zsh/zftp Module)
 ), must be available in the
 version of tt(zsh) installed at your site.  If the shell is configured to
 load new commands at run time, it probably is: typing `tt(zmodload zsh/zftp)'
@@ -515,7 +515,7 @@ cindex(styles in zftp functions)
 Various styles are available using the standard shell style mechanism,
 described in
 ifzman(zmanref(zshmodules))\
-ifnzman(noderef(The zutil Module)). Briefly, the
+ifnzman(noderef(The zsh/zutil Module)). Briefly, the
 command `tt(zstyle ':zftp:*') var(style) var(value) ...'.
 defines the var(style) to have value var(value) (more than one may be
 given, although that is not useful in the cases described here).  These
diff --git a/Doc/Zsh/zle.yo b/Doc/Zsh/zle.yo
index baca81e62..3d08bf85d 100644
--- a/Doc/Zsh/zle.yo
+++ b/Doc/Zsh/zle.yo
@@ -87,7 +87,7 @@ or built in.
 The standard widgets built in to ZLE are listed in Standard Widgets below.
 Other built-in widgets can be defined by other modules (see
 ifzman(zmanref(zshmodules))\
-ifnzman(noderef(Zsh Modules))\
+ifnzman(noderef(Zsh zsh/Modules))\
 ).  Each built-in widget has two names: its normal canonical name, and the
 same name preceded by a `tt(.)'.  The `tt(.)' name is special: it can't be
 rebound to a different widget.  This makes the widget available even when