diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Completion/Bsd/_bsd_pkg | 2 | ||||
| -rw-r--r-- | Completion/User/_lzop | 2 | ||||
| -rw-r--r-- | Doc/Zsh/cond.yo | 25 | ||||
| -rw-r--r-- | Functions/Misc/is-at-least | 1 |
5 files changed, 37 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index c07cec0cd..c26a06f29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2000-05-16 Bart Schaefer <schaefer@zsh.org> + + * Felix Rosencrantz: 11398: Completion/User/_lzop, + Completion/Bsd/_bsd_pkg: Fix typos in option descriptions. + + * 11378: Functions/Misc/is-at-least, Misc/make-zsh-urls: Remove + RCS Id strings. + + * unposted: Doc/Zsh/cond.yo: Yodl off some excess whitespace. + 2000-05-16 Tanaka Akira <akr@zsh.org> * 11415: Completion/User/_cvs: follow the new matcher-list behaviour. diff --git a/Completion/Bsd/_bsd_pkg b/Completion/Bsd/_bsd_pkg index 0cdfd9c1e..f60348479 100644 --- a/Completion/Bsd/_bsd_pkg +++ b/Completion/Bsd/_bsd_pkg @@ -49,7 +49,7 @@ _bsd_pkg() { '-c[show comment fields]' \ '-d[show long descriptions]' \ '-D[show install-message files]' \ - '-f[show packing list instrcutions]' \ + '-f[show packing list instructions]' \ '-i[show install scripts]' \ '-I[show index lines]' \ '-k[show deinstall scripts]' \ diff --git a/Completion/User/_lzop b/Completion/User/_lzop index 927a34087..fa8d46c58 100644 --- a/Completion/User/_lzop +++ b/Completion/User/_lzop @@ -58,7 +58,7 @@ _arguments -C -s \ '(--outfile)-o[specify output file]:output file:_files' \ '(-o)--outfile=[specify output file]:output file:_files' \ '(--path)-p[write output files to specified directory]:directory:_files -/' \ - '(-p)--path=[[write output files to specified directory]:directory:_files -/' \ + '(-p)--path=[write output files to specified directory]:directory:_files -/' \ '(--no-checksum)-F[do not store or verify a checksum]' \ '(-F)--no-checksum[do not store or verify a checksum]' \ "(--keep -U --unlink --delete)-k[keep (don't delete) input files]" \ diff --git a/Doc/Zsh/cond.yo b/Doc/Zsh/cond.yo index 0ff49b187..73430dd5a 100644 --- a/Doc/Zsh/cond.yo +++ b/Doc/Zsh/cond.yo @@ -149,6 +149,20 @@ true if either var(exp1) or var(exp2) is true. ) enditem() +Normal shell expansion is performed on the var(file), var(string) and +var(pattern) arguments, but the result of each expansion is constrained to +be a single word, similar to the effect of double quotes. However, pattern +metacharacters are active for the var(pattern) arguments; the patterns +are the same as those used for filename generation, see +ifzman(\ +zmanref(zshexpn)\ +)\ +ifnzman(\ +noderef(Filename Generation)\ +)\ +, but there is no special behaviour +of `tt(/)' nor initial dots, and no glob qualifiers are allowed. + In each of the above expressions, if var(file) is of the form `tt(/dev/fd/)var(n)', where var(n) is an integer, @@ -156,3 +170,14 @@ then the test applied to the open file whose descriptor number is var(n), even if the underlying system does not support the tt(/dev/fd) directory. + +In the forms which do numeric comparison, the expressions var(exp) +undergo arithmetic expansion as if they were enclosed in tt($((...))). + +For example, the following: + +example([[ ( -f foo || -f bar ) && $report = y* ]] && print File exists.) + +tests if either file tt(foo) or file tt(bar) exists, and if so, if the +value of the parameter tt(report) begins with `tt(y)'; if the complete +condition is true, the message `tt(File exists.)' is printed. diff --git a/Functions/Misc/is-at-least b/Functions/Misc/is-at-least index 3eb62ef67..eab771332 100644 --- a/Functions/Misc/is-at-least +++ b/Functions/Misc/is-at-least @@ -1,4 +1,3 @@ -# $Id: is-at-least,v 1.2 2000/04/01 20:49:47 pws Exp $ -*- shell-script -*- # # Test whether $ZSH_VERSION (or some value of your choice, if a second argument # is provided) is greater than or equal to x.y.z-r (in argument one). In fact, |