about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2000-09-04 07:21:57 +0000
committerBart Schaefer <barts@users.sourceforge.net>2000-09-04 07:21:57 +0000
commit07c0b1a306f099d1c8cb530286a1a32950f0185e (patch)
tree796c576613936f2bdc5768fe1a666ae9a9c476d2
parentf23e444392493677896f947ae4ca0e1da07ff696 (diff)
downloadzsh-07c0b1a306f099d1c8cb530286a1a32950f0185e.tar.gz
zsh-07c0b1a306f099d1c8cb530286a1a32950f0185e.tar.xz
zsh-07c0b1a306f099d1c8cb530286a1a32950f0185e.zip
Fix 12722.
-rw-r--r--ChangeLog5
-rw-r--r--Src/params.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b94f6f27..f0d0970b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-04  Bart Schaefer  <schaefer@zsh.org>
+
+	* 12732: Src/params.c: Suppress base# prefix when base is 10 even
+	if the [##base] format of 12722 was not used.
+
 2000-09-03  Clint Adams  <schizo@debian.org>
 
 	* 12728: Completion/User/_man: complete _files instead of
diff --git a/Src/params.c b/Src/params.c
index 2d38272a6..93319dbfe 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -3049,8 +3049,10 @@ convbase(char *s, zlong v, int base)
 	    sprintf(s, "0x");
 	else if (isset(CBASES) && base == 8 && isset(OCTALZEROES))
 	    sprintf(s, "0");
-	else
+	else if (base != 10)
 	    sprintf(s, "%d#", base);
+	else
+	    *s = 0;
 	s += strlen(s);
     } else
 	base = -base;