15793: Src/Modules/zftp.c: require zsh/net/tcp explicitly.

15171: Doc/Zsh/zftpsys.yo: minor changes of phrasing

3 files changed, 17 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 6bc01c14f..4e7b29ec1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-26  Peter Stephenson  <pws@csr.com>
+
+	* 16171: Doc/Zsh/zftpsys.yo: minor changes of phrasing.
+
+	* 15793: Src/Modules/zftp.c: require zsh/net/tcp explicitly from
+	setup_ function for zftp.
+
 2001-10-25  Peter Stephenson  <pws@csr.com>
 
 	* 16145: Src/Builtins/rlimits.c: try to handle both RLIMITS_VMEM
diff --git a/Doc/Zsh/zftpsys.yo b/Doc/Zsh/zftpsys.yo
index 53c18be46..b8ffa562b 100644
--- a/Doc/Zsh/zftpsys.yo
+++ b/Doc/Zsh/zftpsys.yo
@@ -173,7 +173,8 @@ Produce a long directory listing.  The arguments var(dir-options) and
 var(dir) are passed directly to the server and their effect is
 implementation dependent, but specifying a particular remote directory
 var(dir) is usually possible.  The output is passed through a pager
-given by the environment variable tt($PAGER) or defaulting to `tt(more)'.
+given by the environment variable tt($PAGER), or `tt(more)' if that is not
+set.
 
 The directory is usually cached for re-use.  In fact, two caches are
 maintained.  One is for use when there is no var(dir-options) or var(dir),
@@ -357,7 +358,7 @@ findex(zftransfer)
 item(tt(zftransfer) var(sess1)tt(:)var(file1) var(sess2)tt(:)var(file2))(
 Transfer files between two sessions; no local copy is made.  The file
 is read from the session var(sess1) as var(file1) and written to session
-var(sess1) as file var(file2); var(file1) and var(file2) may be relative to
+var(sess2) as file var(file2); var(file1) and var(file2) may be relative to
 the current directories of the session.  Either var(sess1) or var(sess2)
 may be omitted (though the colon should be retained if there is a
 possibility of a colon appearing in the file name) and defaults to the
@@ -366,8 +367,8 @@ which case the basename of var(file1) will be added.  The sessions
 var(sess1) and var(sess2) must be distinct.
 
 The operation is performed using pipes, so it is required that the
-connections still be valid in a subshell, which is not the case under some
-versions operating systems, presumably due to a system bug.
+connections still be valid in a subshell, which is not the case under 
+versions of some operating systems, presumably due to a system bug.
 )
 enditem()
 
@@ -385,7 +386,7 @@ item(tt(zfmark [ )var(bookmark)tt( ]))(
 If given an argument, mark the current host, user and directory under the
 name var(bookmark) for later use by tt(zfgoto).  If there is no connection
 open, use the values for the last connection immediately before it was
-closed; it is an error if there is none.  Any existing bookmark
+closed; it is an error if there was none.  Any existing bookmark
 under the same name will be silently replaced.
 
 If not given an argument, list the existing bookmarks and the points to
@@ -517,8 +518,8 @@ described in
 ifzman(zmanref(zshmodules))\
 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
+defines the var(style) to have value var(value); more than one value may be
+given, although that is not useful in the cases described here.  These
 values will then be used throughout the zftp function system.  For more
 precise control, the first argument, which gives a context in which the
 style applies, can be modified to include a particular function, as for
diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c
index c507a85ce..39df87fd7 100644
--- a/Src/Modules/zftp.c
+++ b/Src/Modules/zftp.c
@@ -3107,7 +3107,8 @@ zftpexithook(Hookdef d, void *dummy)
 int
 setup_(Module m)
 {
-    return 0;
+    /* setup_ returns 0 for success. require_module returns 1 for success. */
+    return !require_module("", "zsh/net/tcp", 0, 0);
 }
 
 /**/