diff options
author | Axel Beckert <abe@deuxchevaux.org> | 2013-12-02 15:39:20 +0100 |
---|---|---|
committer | Axel Beckert <abe@deuxchevaux.org> | 2013-12-02 15:39:20 +0100 |
commit | 8f07e7658dcdfecc082ddaaad8e26f460eb02d45 (patch) | |
tree | a16ecc9a433b450827fbd056b06a3260592a8a37 /Doc/Zsh/contrib.yo | |
parent | df234cd62d04180a54071c7a2a5210d1f16c8b98 (diff) | |
parent | 56aa469d06a60ff23fe0c50ab9d44ae40c150412 (diff) | |
download | zsh-8f07e7658dcdfecc082ddaaad8e26f460eb02d45.tar.gz zsh-8f07e7658dcdfecc082ddaaad8e26f460eb02d45.zip |
Merge branch 'upstream' into debian
Diffstat (limited to 'Doc/Zsh/contrib.yo')
-rw-r--r-- | Doc/Zsh/contrib.yo | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo index 9d3fc7562..bb6613ece 100644 --- a/Doc/Zsh/contrib.yo +++ b/Doc/Zsh/contrib.yo @@ -3155,7 +3155,7 @@ sect(Mathematical Functions) startitem() findex(zcalc) -item(tt(zcalc) [ var(expression) ... ])( +item(tt(zcalc) [ tt(-ef) ] [ var(expression) ... ])( A reasonably powerful calculator based on zsh's arithmetic evaluation facility. The syntax is similar to that of formulae in most programming languages; see @@ -3195,6 +3195,10 @@ The output base can be initialised by passing the option `tt(-#)var(base)', for example `tt(zcalc -#16)' (the `tt(#)' may have to be quoted, depending on the globbing options set). +If the option `tt(-e)' is set, the function runs non-interactively: +the arguments are treated as expressions to be evaluated as if entered +interactively line by line. + If the option `tt(-f)' is set, all numbers are treated as floating point, hence for example the expression `tt(3/4)' evaluates to 0.75 rather than 0. Options must appear in separate words. |