mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-13 01:31:18 +02:00
Code Releases Activity

32453: fix zcalc default base handling

Browse source
This commit is contained in:
Peter Stephenson 2014-03-01 21:27:47 +00:00
parent 973e5dc37d
commit 965d7305e5
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,5 +1,7 @@
2014-03-01 Peter Stephenson <p.w.stephenson@ntlworld.com> 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: * Manuel Presnitz: 32412 modified c.f. 32415:
Completion/Zsh/Type/_globquals, Doc/Zsh/expn.yo, Src/glob.c, Completion/Zsh/Type/_globquals, Doc/Zsh/expn.yo, Src/glob.c,
Src/zsh.h: gigabyte and terabyte units for glob qualifiers. Src/zsh.h: gigabyte and terabyte units for glob qualifiers.

2
Functions/Misc/zcalc
View file

@ -197,7 +197,7 @@ while (( expression_mode )) ||
# Set default base if `[#16]' or `[##16]' etc. on its own. # Set default base if `[#16]' or `[##16]' etc. on its own.
# Unset it if `[#]' or `[##]'. # Unset it if `[#]' or `[##]'.
if [[ $line = (#b)[[:blank:]]#('[#'(\#|)((<->|)(|_|_<->))']')[[:blank:]]#(*) ]]; then if [[ $line = (#b)[[:blank:]]#('[#'(\#|)((<->|)(|_|_<->))']')[[:blank:]]#(*) ]]; then
if [[ -z $match[4] ]]; then if [[ -z $match[6] ]]; then
if [[ -z $match[3] ]]; then if [[ -z $match[3] ]]; then
defbase= defbase=
else else