From: Andreas Schwab <schwab@suse.de>
Date: Fri, 16 Nov 2007 00:17:40 +0000 (+0000)
Subject: Always take precision into account.
X-Git-Tag: emacs-pretest-23.0.90~9710
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0e4df721fa28e3cfd9992fa6db0bd266fb94f5e7;p=emacs.git

Always take precision into account.
---

diff --git a/src/editfns.c b/src/editfns.c
index eaee2bfadfa..fae485ae709 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3594,8 +3594,6 @@ usage: (format STRING &rest OBJECTS)  */)
 	/* Would get MPV otherwise, since Lisp_Int's `point' to low memory.  */
 	else if (INTEGERP (args[n]) && *format != 's')
 	  {
-	    thissize = 30;
-
 	    /* The following loop assumes the Lisp type indicates
 	       the proper way to pass the argument.
 	       So make sure we have a flonum if the argument should
@@ -3603,14 +3601,13 @@ usage: (format STRING &rest OBJECTS)  */)
 	    if (*format == 'e' || *format == 'f' || *format == 'g')
 	      {
 		args[n] = Ffloat (args[n]);
-		if (precision[n] > 0)
-		  thissize += precision[n];
 	      }
 	    else
 	      if (*format != 'd' && *format != 'o' && *format != 'x'
 		  && *format != 'i' && *format != 'X' && *format != 'c')
 		error ("Invalid format operation %%%c", *format);
 
+	    thissize = 30 + (precision[n] > 0 ? precision[n] : 0);
 	    if (*format == 'c')
 	      {
 		if (! SINGLE_BYTE_CHAR_P (XINT (args[n]))