diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | Functions/Misc/zcalc | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 82ed670eb..d651c779e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2001-10-08 Peter Stephenson <pws@csr.com> + * 15980: Functions/Misc/zcalc: '[#16] 2000' ignored the base. + * unposted: LICENCE: wording change from ages ago. 2001-10-08 Oliver Kiddle <opk@zsh.org> diff --git a/Functions/Misc/zcalc b/Functions/Misc/zcalc index d9d1fb91b..78a48b9b0 100644 --- a/Functions/Misc/zcalc +++ b/Functions/Misc/zcalc @@ -141,7 +141,11 @@ while vared -cehp "${(%)ZCALCPROMPT}" line; do eval "latest=\$(( $line ))" argv[num++]=$latest psvar[1]=$num - print -- $(( $base $latest )) + if [[ -z $base ]]; then + print -- $latest + else + print -- $(( $base $latest )) + fi fi line= done |