diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2015-11-30 01:47:16 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2015-11-30 01:47:16 +0100 |
| commit | 86bb6a7e771a762ba30334ab6c92e6f75624c9f2 (patch) | |
| tree | 93bec5ff2b724e94b62c7ed78fed21feb1ce91a7 /Functions | |
| parent | e6d23bf39af6312478253559d7109b08ad6e332c (diff) | |
| parent | fa40bfac03d0ce20fb92dede94f118a17d4af9d8 (diff) | |
| download | zsh-86bb6a7e771a762ba30334ab6c92e6f75624c9f2.tar.gz zsh-86bb6a7e771a762ba30334ab6c92e6f75624c9f2.zip | |
Merge tag 'zsh-5.1.1-test-3' into debian
Third test version prior to zsh 5.2 release.
Diffstat (limited to 'Functions')
| -rw-r--r-- | Functions/Misc/zcalc | 4 | ||||
| -rw-r--r-- | Functions/Prompts/prompt_walters_setup | 6 |
2 files changed, 6 insertions, 4 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 diff --git a/Functions/Prompts/prompt_walters_setup b/Functions/Prompts/prompt_walters_setup index b2b0b8430..7948254d8 100644 --- a/Functions/Prompts/prompt_walters_setup +++ b/Functions/Prompts/prompt_walters_setup @@ -14,10 +14,10 @@ EOF prompt_walters_setup () { if [[ "$TERM" != "dumb" ]]; then - export PROMPT='%B%(?..[%?] )%b%n@%U%m%u> ' - export RPROMPT="%F{${1:-green}}%~%f" + PROMPT='%B%(?..[%?] )%b%n@%U%m%u> ' + RPROMPT="%F{${1:-green}}%~%f" else - export PROMPT="%(?..[%?] )%n@%m:%~> " + PROMPT="%(?..[%?] )%n@%m:%~> " fi prompt_opts=(cr percent) |