1 files changed, 41 insertions, 55 deletions

diff --git a/src/editfns.c b/src/editfns.c
index 96bb271b2d6..3a34dd0980b 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4563,32 +4563,30 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
                  and with pM inserted for integer formats.
                  At most two flags F can be specified at once.  */
               char convspec[sizeof "%FF.*d" + max (INT_AS_LDBL, pMlen)];
-              {
-                char *f = convspec;
-                *f++ = '%';
-                /* MINUS_FLAG and ZERO_FLAG are dealt with later.  */
-                *f = '+'; f +=  plus_flag;
-                *f = ' '; f += space_flag;
-                *f = '#'; f += sharp_flag;
-                *f++ = '.';
-                *f++ = '*';
-                if (float_conversion)
-                  {
-                    if (INT_AS_LDBL)
-                      {
-                        *f = 'L';
-                        f += INTEGERP (arg);
-                      }
-                  }
-                else if (conversion != 'c')
-                  {
-                    memcpy (f, pMd, pMlen);
-                    f += pMlen;
-                    zero_flag &= ! precision_given;
-                  }
-                *f++ = conversion;
-                *f = '\0';
-              }
+              char *f = convspec;
+              *f++ = '%';
+              /* MINUS_FLAG and ZERO_FLAG are dealt with later.  */
+              *f = '+'; f +=  plus_flag;
+              *f = ' '; f += space_flag;
+              *f = '#'; f += sharp_flag;
+              *f++ = '.';
+              *f++ = '*';
+              if (float_conversion)
+                {
+                  if (INT_AS_LDBL)
+                    {
+                      *f = 'L';
+                      f += INTEGERP (arg);
+                    }
+                }
+              else if (conversion != 'c')
+                {
+                  memcpy (f, pMd, pMlen);
+                  f += pMlen;
+                  zero_flag &= ! precision_given;
+                }
+              *f++ = conversion;
+              *f = '\0';
 
               int prec = -1;
               if (precision_given)
@@ -4630,29 +4628,20 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
                 }
               else if (conversion == 'd' || conversion == 'i')
                 {
-                  /* For float, maybe we should use "%1.0f"
-                     instead so it also works for values outside
-                     the integer range.  */
-                  printmax_t x;
                   if (INTEGERP (arg))
-                    x = XINT (arg);
+                    {
+                      printmax_t x = XINT (arg);
+                      sprintf_bytes = sprintf (sprintf_buf, convspec, prec, x);
+                    }
                   else
                     {
-                      double d = XFLOAT_DATA (arg);
-                      if (d < 0)
-                        {
-                          x = TYPE_MINIMUM (printmax_t);
-                          if (x < d)
-                            x = d;
-                        }
-                      else
-                        {
-                          x = TYPE_MAXIMUM (printmax_t);
-                          if (d < x)
-                            x = d;
-                        }
+                      strcpy (f - pMlen - 1, "f");
+                      double x = XFLOAT_DATA (arg);
+                      sprintf_bytes = sprintf (sprintf_buf, convspec, 0, x);
+                      char c0 = sprintf_buf[0];
+                      bool signedp = ! ('0' <= c0 && c0 <= '9');
+                      prec = min (precision, sprintf_bytes - signedp);
                     }
-                  sprintf_bytes = sprintf (sprintf_buf, convspec, prec, x);
                 }
               else
                 {
@@ -4663,22 +4652,19 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message)
                   else
                     {
                       double d = XFLOAT_DATA (arg);
-                      if (d < 0)
-                        x = 0;
-                      else
-                        {
-                          x = TYPE_MAXIMUM (uprintmax_t);
-                          if (d < x)
-                            x = d;
-                        }
+                      double uprintmax = TYPE_MAXIMUM (uprintmax_t);
+                      if (! (0 <= d && d < uprintmax + 1))
+                        xsignal1 (Qoverflow_error, arg);
+                      x = d;
                     }
                   sprintf_bytes = sprintf (sprintf_buf, convspec, prec, x);
                 }
 
               /* Now the length of the formatted item is known, except it omits
                  padding and excess precision.  Deal with excess precision
-                 first.  This happens only when the format specifies
-                 ridiculously large precision.  */
+                 first.  This happens when the format specifies ridiculously
+                 large precision, or when %d or %i formats a float that would
+                 ordinarily need fewer digits than a specified precision.  */
               ptrdiff_t excess_precision
                 = precision_given ? precision - prec : 0;
               ptrdiff_t leading_zeros = 0, trailing_zeros = 0;