comparison src/editfns.c @ 21064:90bdbe2754c8

(Fformat): Format multibyte characters by "%c" correctly. Handle padding for multibyte characters correctly.

21063:44845df088bc

	       So make sure we have a flonum if the argument should
	       be a double.  */
	    if (*format == 'e' || *format == 'f' || *format == 'g')
	      args[n] = Ffloat (args[n]);
#endif
	    thissize = 30;
	  }
#ifdef LISP_FLOAT_TYPE
	else if (FLOATP (args[n]) && *format != 's')
	  {
	    if (! (*format == 'e' || *format == 'f' || *format == 'g'))

	  ++n;

	  if (STRINGP (args[n]))
	    {
	      int padding, nbytes;

	      nbytes = copy_text (XSTRING (args[n])->data, p,
				  XSTRING (args[n])->size_byte,
				  STRING_MULTIBYTE (args[n]), multibyte);
	      p += nbytes;
	      nchars += XSTRING (args[n])->size;

	      /* If spec requires it, pad on right with spaces.  */
	      padding = minlen - XSTRING (args[n])->size;
	      while (padding-- > 0)
		{
		  *p++ = ' ';
		  nchars++;
		}

21064:90bdbe2754c8

	       So make sure we have a flonum if the argument should
	       be a double.  */
	    if (*format == 'e' || *format == 'f' || *format == 'g')
	      args[n] = Ffloat (args[n]);
#endif
	    thissize = 30;	
	    if (*format == 'c' && ! SINGLE_BYTE_CHAR_P (XINT (args[n])))
	      {
		if (! multibyte)
		  {
		    multibyte = 1;
		    goto retry;
		  }
		args[n] = Fchar_to_string (args[n]);
		thissize = XSTRING (args[n])->size_byte;
	      }
	  }
#ifdef LISP_FLOAT_TYPE
	else if (FLOATP (args[n]) && *format != 's')
	  {
	    if (! (*format == 'e' || *format == 'f' || *format == 'g'))

	  ++n;

	  if (STRINGP (args[n]))
	    {
	      int padding, nbytes, width;

	      nbytes = copy_text (XSTRING (args[n])->data, p,
				  XSTRING (args[n])->size_byte,
				  STRING_MULTIBYTE (args[n]), multibyte);
	      width = strwidth (p, nbytes);
	      p += nbytes;
	      nchars += XSTRING (args[n])->size;

	      /* If spec requires it, pad on right with spaces.  */
	      padding = minlen - width;
	      while (padding-- > 0)
		{
		  *p++ = ' ';
		  nchars++;
		}