summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2002-01-09 11:58:04 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2002-01-09 11:58:04 +0000
commit99d54b0b70f19d3e08f3b8f124a1feec065488f2 (patch)
tree153ce59cb4fddb38e60485bfef4a54e413af276b
parent3013e98ca4f5bb8d9365c31dc09ea0f625e7733e (diff)
downloadzsh-99d54b0b70f19d3e08f3b8f124a1feec065488f2.tar.gz
zsh-99d54b0b70f19d3e08f3b8f124a1feec065488f2.tar.xz
zsh-99d54b0b70f19d3e08f3b8f124a1feec065488f2.zip
16422: zcalc non-default base output
-rw-r--r--ChangeLog5
-rw-r--r--Functions/Misc/zcalc2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 75e7411a0..d12dcd643 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-09  Peter Stephenson  <pws@csr.com>
+
+	* 16422: Functions/Misc/zcalc: fix output in bases when
+	base is specified for a single line.
+
 2002-01-08  Sven Wischnowsky  <wischnow@zsh.org>
 
 	* 16418: Src/lex.c, Src/Zle/zle_tricky.c: fix completion after
diff --git a/Functions/Misc/zcalc b/Functions/Misc/zcalc
index 633a38e92..31ab11dba 100644
--- a/Functions/Misc/zcalc
+++ b/Functions/Misc/zcalc
@@ -173,7 +173,7 @@ while vared -cehp "${(%)ZCALCPROMPT}" line; do
       line=
       continue
     else
-      base=
+      base=$match[1]
     fi
   else
     base=$defbase