diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2010-01-08 09:30:43 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2010-01-08 09:30:43 +0000 |
| commit | 8c60540ce6a2969878c8e172e0015d32e5a6ddc0 (patch) | |
| tree | c81e7187e83239f067aadb64b78aee222e3bbced | |
| parent | b1e8b11abe7542527c3d22065474d7379f865d2c (diff) | |
| download | zsh-8c60540ce6a2969878c8e172e0015d32e5a6ddc0.tar.gz zsh-8c60540ce6a2969878c8e172e0015d32e5a6ddc0.tar.xz zsh-8c60540ce6a2969878c8e172e0015d32e5a6ddc0.zip | |
27577: sergio: (%) is not needed in zcalc prompt since PROMPTPERCENT is obeyed
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Functions/Misc/zcalc | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index fc3a3fc75..c01235c3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-01-08 Peter Stephenson <pws@csr.com> + + * 27577: sergio: Functions/Misc/zcalc: vared -p obeys + the PROMPTPERCENT option so it's not necessary to have an + explicit (%) in the variable expansion. + 2010-01-07 Clint Adams <clint@zsh.org> * 27579: Completion/Unix/Command/_ssh: allow ssh -S argument to @@ -22,6 +28,7 @@ * Jesse Weinstein: 27558: Completion/Unix/Command/_espeak: completion for espeak. +>>>>>>> 1.4856 2010-01-04 Peter Stephenson <pws@csr.com> * 27556: Src/lex.c: lexsave() should sanitize more variables else @@ -12553,5 +12560,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4856 $ +* $Revision: 1.4857 $ ***************************************************** diff --git a/Functions/Misc/zcalc b/Functions/Misc/zcalc index 42bb72e2c..ebf5cf471 100644 --- a/Functions/Misc/zcalc +++ b/Functions/Misc/zcalc @@ -152,7 +152,7 @@ for (( num = 1; num <= $#; num++ )); do done psvar[1]=$num -while vared -cehp "${(%)ZCALCPROMPT}" line; do +while vared -cehp "${ZCALCPROMPT}" line; do [[ -z $line ]] && break # special cases # Set default base if `[#16]' or `[##16]' etc. on its own. |