comparison src/editfns.c @ 42484:717eee813b2c

(Fformat): Update thissize from field_width based on the actual width, in the string case.

42483:52015642068d

  n = 0;
  while (format != end)
    if (*format++ == '%')
      {
	int thissize = 0;
	unsigned char *this_format_start = format - 1;
	int field_width, precision;

	/* General format specifications look like

	  {
	  string:
	    if (*format != 's' && *format != 'S')
	      error ("Format specifier doesn't match argument type");
	    thissize = CONVERTED_BYTE_SIZE (multibyte, args[n]);
	  }
	/* Would get MPV otherwise, since Lisp_Int's `point' to low memory.  */
	else if (INTEGERP (args[n]) && *format != 's')
	  {
	    /* The following loop assumes the Lisp type indicates

	      }
	    args[n] = tem;
	    goto string;
	  }

	thissize = max (field_width, thissize);
	total += thissize + 4;
      }

  /* Now we can no longer jump to retry.
     TOTAL and LONGEST_FORMAT are known for certain.  */

42484:717eee813b2c

  n = 0;
  while (format != end)
    if (*format++ == '%')
      {
	int thissize = 0;
	int actual_width = 0;
	unsigned char *this_format_start = format - 1;
	int field_width, precision;

	/* General format specifications look like

	  {
	  string:
	    if (*format != 's' && *format != 'S')
	      error ("Format specifier doesn't match argument type");
	    thissize = CONVERTED_BYTE_SIZE (multibyte, args[n]);
	    actual_width = lisp_string_width (args[n], -1, NULL, NULL);
	  }
	/* Would get MPV otherwise, since Lisp_Int's `point' to low memory.  */
	else if (INTEGERP (args[n]) && *format != 's')
	  {
	    /* The following loop assumes the Lisp type indicates

	      }
	    args[n] = tem;
	    goto string;
	  }

	thissize += max (0, field_width - actual_width);
	total += thissize + 4;
      }

  /* Now we can no longer jump to retry.
     TOTAL and LONGEST_FORMAT are known for certain.  */