diff options
Diffstat (limited to 'Doc/Zsh')
-rw-r--r-- | Doc/Zsh/compsys.yo | 42 | ||||
-rw-r--r-- | Doc/Zsh/metafaq.yo | 25 | ||||
-rw-r--r-- | Doc/Zsh/params.yo | 2 | ||||
-rw-r--r-- | Doc/Zsh/zftpsys.yo | 14 |
4 files changed, 61 insertions, 22 deletions
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo index 29f83da4a..5a52ca9ad 100644 --- a/Doc/Zsh/compsys.yo +++ b/Doc/Zsh/compsys.yo @@ -6,12 +6,22 @@ cindex(completion, controlling) sect(Description) This describes the shell code for the new completion system. It consists -of varsious shell functions; those beginning `tt(comp)' are to be called +of various shell functions; those beginning `tt(comp)' are to be called directly by the user, while those beginning `tt(_)' are called by the completion code. The shell functions of the second set which implement completion behaviour and which may be bound to keystrokes, are referred to as `widgets'. +Note that with the function-based completions described here, it +is also possible to use the `tt(compctl -M ...)' mechanism to specify +global matching control, such as case-insensitivity (`tt(abc)' will complete +to a string beginning `tt(ABC)'), or wildcard behaviour on +certain anchors (`tt(a-d)' will complete to abc-def as if there were a +`tt(*)' after the `a'). See +ifzman(the section `Matching Control' in zmanref(zshcompctl))\ +ifnzman(noderef(Matching Control)) +for further details. + startmenu() menu(Initialization) menu(Control Functions) @@ -728,14 +738,28 @@ These functions also accept the `tt(-J)', `tt(-V)', `tt(-X)', `tt(-P)', `tt(-S)', `tt(-q)', `tt(-r)', and `tt(-R)' options from the tt(compadd) builtin. -Finally, the tt(_path_files) function supports two configuration keys. -If tt(path_expand) is set to any non-empty string, the partially +Finally, the tt(_path_files) function supports three configuration keys. +startitem() +item(tt(path_expand))( +If this is set to any non-empty string, the partially typed path from the line will be expanded as far as possible even if -trailing pathname components can not be completed. And if -tt(path_cursor) is set to a non-empty string, the cursor will be left +trailing pathname components can not be completed. +) +item(tt(path_cursor))( +If this is set to a non-empty string, the cursor will be left after the first ambiguous pathname component even when menucompletion is used. ) +item(tt(path_keepdir))( +If this is set to a non-empty string, then if completion immediately after +a slash fails, treat the original string as a successful completion. This +prevents a valid directory being treated as a candidate for correction. +However, it has the side effect that a pattern completion, such as +`tt(files -g *(*))', will no longer try to complete directories in this +position if there are no file matches. +) +enditem() +) item(tt(_parameters))( This should be used to complete parameter names if you need some of the extra options of tt(compadd). All arguments are passed unchanged to @@ -804,7 +828,7 @@ with two hyphens. The option `tt(-i) var(patterns)' can be used to give patterns for options which should not be completed. The patterns can be given as the name of an array parameter or as a literal list in parentheses. E.g. `tt(-i "(--(en|dis)able-FEATURE*)")' will ignore the -options `tt(--enable-FEATURE)' and `tt(--diable-FEATURE)'. Finally, +options `tt(--enable-FEATURE)' and `tt(--disable-FEATURE)'. Finally, the option `tt(-s) var(pairs)' can be used to describe options aliases. Each var(pair) consists of a pattern and a replacement. E.g. some tt(configure)-scripts describe options only as @@ -829,7 +853,7 @@ standard directory where it appears. startitem() item(tt(Core))( The core scripts and functions. You will certainly need these, though will -probably not need to alter them. Many of these are docmented above. +probably not need to alter them. Many of these are documented above. ) item(tt(Base))( Other functions you will almost certainly want if you are going to use @@ -862,8 +886,8 @@ startitem() item(tt(_correct_filename (^XC)))( Correct the filename path at the cursor position. Allows up to six errors in the name. Can also be called with an argument to correct -a filepath, independently of zle; the correction is printed on standard -output. +a filename path, independently of zle; the correction is printed on +standard output. ) item(tt(_correct_word) (^Xc))( Performs correction of the current argument using the usual contextual diff --git a/Doc/Zsh/metafaq.yo b/Doc/Zsh/metafaq.yo index c27f4f152..a47fac515 100644 --- a/Doc/Zsh/metafaq.yo +++ b/Doc/Zsh/metafaq.yo @@ -18,11 +18,12 @@ the code should generally go to the mailing list. texinode(Availability)(Mailing Lists)(Author)(Introduction) sect(Availability) Zsh is available from the following anonymous FTP sites. These mirror -sites are kept frequently up to date. The sites marked with em((G)) -may be mirroring tt(ftp.math.gatech.edu) instead of the primary site. -The sites marked with em((H)) may be mirroring tt(ftp.cs.elte.hu) -instead of the primary site. +sites are kept frequently up to date. The sites marked with em((H)) may be +mirroring tt(ftp.cs.elte.hu) instead of the primary site. +cindex(FTP sites for zsh) +cindex(acquiring zsh by FTP) +cindex(availability of zsh) startitem() item(Primary site)( nofill(tt(ftp://ftp.zsh.org/pub/zsh/) @@ -31,7 +32,7 @@ tt(http://www.zsh.org/pub/zsh/)) item(Australia)( nofill(tt(ftp://ftp.zsh.org/pub/zsh/) tt(http://www.zsh.org/pub/zsh/) -tt(ftp://ftp.ips.gov.au/pub/packages/zsh/) em((G)) em((H))) +tt(ftp://ftp.ips.gov.au/pub/packages/zsh/) em((H))) ) item(Denmark)( nofill(tt(ftp://sunsite.auc.dk/pub/unix/shells/zsh/)) @@ -56,19 +57,24 @@ item(Israel)( nofill(tt(ftp://ftp.math.technion.ac.il/mirror/ftp.zsh.org/pub/zsh/) tt(http://www.math.technion.ac.il/mirror/ftp.zsh.org/pub/zsh/)) ) +item(Italy)( +nofill(tt(ftp://ftp.unina.it/pub/Unix/pkgs/shell/zsh/)) +) item(Japan)( -nofill(tt(ftp://ftp.tohoku.ac.jp/mirror/zsh/) em((H)) -tt(ftp://ftp.nisiq.net/pub/shells/zsh/) em((H)) +nofill(tt(ftp://ftp.nisiq.net/pub/shells/zsh/) em((H)) tt(ftp://ftp.win.ne.jp/pub/shell/zsh/)) ) item(Norway)( nofill(tt(ftp://ftp.uit.no/pub/unix/shells/zsh/)) ) +item(Poland)( +nofill(tt(ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/)) +) item(Romania)( nofill(tt(ftp://ftp.roedu.net/pub/mirrors/ftp.zsh.org/pub/zsh/)) ) item(Slovenia)( -nofill(tt(ftp://ftp.siol.net/pub/unix/shells/zsh/) em((H))) +nofill(tt(ftp://ftp.siol.net/mirrors/zsh/)) ) item(Sweden)( nofill(tt(ftp://ftp.lysator.liu.se/pub/unix/zsh/)) @@ -78,8 +84,7 @@ nofill(tt(ftp://ftp.net.lut.ac.uk/zsh/) tt(ftp://sunsite.org.uk/packages/zsh/)) ) item(USA)( -nofill(tt(ftp://ftp.math.gatech.edu/pub/zsh/) -tt(ftp://uiarchive.uiuc.edu/pub/packages/shells/zsh/) +nofill(tt(ftp://uiarchive.uiuc.edu/pub/packages/shells/zsh/) tt(ftp://ftp.rge.com/pub/shells/zsh/) tt(ftp://foad.org/pub/zsh/) tt(http://foad.org/zsh/)) diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo index f8089faf8..65c8e7599 100644 --- a/Doc/Zsh/params.yo +++ b/Doc/Zsh/params.yo @@ -63,7 +63,7 @@ cindex(subscripts) pindex(KSH_ARRAYS, use of) The same subscripting syntax is used for associative arrays, -except that no arithmetic expansion is applied to var(EXP). +except that no arithmetic expansion is applied to var(exp). A subscript of the form `tt([*])' or `tt([@])' evaluates to all elements of an array; there is no difference between the two diff --git a/Doc/Zsh/zftpsys.yo b/Doc/Zsh/zftpsys.yo index b99604d44..50fa2a800 100644 --- a/Doc/Zsh/zftpsys.yo +++ b/Doc/Zsh/zftpsys.yo @@ -99,6 +99,14 @@ Normally, the var(host), var(user) and var(password) are internally recorded for later re-opening, either by a tt(zfopen) with no arguments, or automatically (see below). With the option `tt(-1)', no information is stored. + +Both tt(zfopen) and tt(zfanon) (but not tt(zfparams)) understand URLs of +the form tt(ftp://)var(host)/var(path...) as meaning to connect to the +var(host), then change directory to var(path) (which must be a directory, +not a file). The `tt(ftp://)' can be omitted; the trailing `tt(/)' is enough +to trigger recognition of the var(path). Note prefixes other than +`tt(ftp:)' are not recognized, and that all characters after the first +slash beyond tt(host) are significant in var(path). ) findex(zfanon) item(tt(zfanon [ -1 ] var(host)))( @@ -204,11 +212,13 @@ tt(zfrtime) below for more information. startitem() findex(zfget) -item(tt(zfget [ -Gt ] var(file1) ...))( +item(tt(zfget [ -Gtc ] var(file1) ...))( Retrieve all the listed files var(file1) ... one at a time from the remote server. If a file contains a `tt(/)', the full name is passed to the remote server, but the file is stored locally under the name given by the -part after the final `tt(/)'. +part after the final `tt(/)'. The option tt(-c) (cat) forces all files to +be sent as a single stream to standard output; in this case the tt(-t) +option has no effect. ) findex(zfuget) item(tt(zfuget [ -Gvst ] var(file1) ...))( |