diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2014-03-01 21:27:47 +0000 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2014-03-01 21:27:47 +0000 |
| commit | 965d7305e57b9b1a009af71368fcbf6da4e756a8 (patch) | |
| tree | c173276c6bd5ac408b83184940888b2966829b53 | |
| parent | 973e5dc37d27cf5c39f33b0ff8839b167004bf3f (diff) | |
| download | zsh-965d7305e57b9b1a009af71368fcbf6da4e756a8.tar.gz zsh-965d7305e57b9b1a009af71368fcbf6da4e756a8.tar.xz zsh-965d7305e57b9b1a009af71368fcbf6da4e756a8.zip | |
32453: fix zcalc default base handling
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Functions/Misc/zcalc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 7344e7a16..1cd1431d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-03-01 Peter Stephenson <p.w.stephenson@ntlworld.com> + * 32453: Functions/Misc/zcalc: fix default base handling. + * Manuel Presnitz: 32412 modified c.f. 32415: Completion/Zsh/Type/_globquals, Doc/Zsh/expn.yo, Src/glob.c, Src/zsh.h: gigabyte and terabyte units for glob qualifiers. diff --git a/Functions/Misc/zcalc b/Functions/Misc/zcalc index 6a56d4782..b79644687 100644 --- a/Functions/Misc/zcalc +++ b/Functions/Misc/zcalc @@ -197,7 +197,7 @@ while (( expression_mode )) || # Set default base if `[#16]' or `[##16]' etc. on its own. # Unset it if `[#]' or `[##]'. if [[ $line = (#b)[[:blank:]]#('[#'(\#|)((<->|)(|_|_<->))']')[[:blank:]]#(*) ]]; then - if [[ -z $match[4] ]]; then + if [[ -z $match[6] ]]; then if [[ -z $match[3] ]]; then defbase= else |