diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-11-27 11:22:49 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-11-27 11:22:49 -0800 |
| commit | c7c51eca164ea2e23c1f10b0e63030e66588f27a (patch) | |
| tree | 15e78786da9562f49ad284e5dad2e190694a885f /Functions/Misc/zcalc | |
| parent | 026cb6a8127dfb9a6277ec42cc251ebc77e1300e (diff) | |
| parent | 8efa4b4088a9f57903954a12eb086b176109bd91 (diff) | |
| download | zsh-c7c51eca164ea2e23c1f10b0e63030e66588f27a.tar.gz zsh-c7c51eca164ea2e23c1f10b0e63030e66588f27a.tar.xz zsh-c7c51eca164ea2e23c1f10b0e63030e66588f27a.zip | |
Fix conflicts in ChangeLog
Diffstat (limited to 'Functions/Misc/zcalc')
| -rw-r--r-- | Functions/Misc/zcalc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Functions/Misc/zcalc b/Functions/Misc/zcalc index 17700e48b..857007a94 100644 --- a/Functions/Misc/zcalc +++ b/Functions/Misc/zcalc @@ -114,7 +114,9 @@ forms=( '%2$g' '%.*g' '%.*f' '%.*E' '') zmodload -i zsh/mathfunc 2>/dev/null autoload -Uz zmathfuncdef -: ${ZCALCPROMPT="%1v> "} +if (( ! ${+ZCALCPROMPT} )); then + typeset -g ZCALCPROMPT="%1v> " +fi # Supply some constants. float PI E |