From 965d7305e57b9b1a009af71368fcbf6da4e756a8 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Sat, 1 Mar 2014 21:27:47 +0000 Subject: 32453: fix zcalc default base handling --- ChangeLog | 2 ++ Functions/Misc/zcalc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7344e7a16..1cd1431d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-03-01 Peter Stephenson + * 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 -- cgit 1.4.1