comparison src/fns.c @ 19278:50f47ef6ce9a

(concat): Pay attention to multibyte characters when TARGET_TYPE is Lisp_String.

19277:7ea957cd48e2

  for (argnum = 0, leni = 0; argnum < nargs; argnum++)
    {
      this = args[argnum];
      len = Flength (this);
      if (VECTORP (this) && target_type == Lisp_String)
	{
	  /* We must pay attention to a multibyte character which
             takes more than one byte in string.  */
	  int i;
	  Lisp_Object ch;

	  for (i = 0; i < XFASTINT (len); i++)
	    {
	      ch = XVECTOR (this)->contents[i];
	      if (! INTEGERP (ch))
		wrong_type_argument (Qintegerp, ch);
	      leni += Fchar_bytes (ch);
	    }
	}
      else
	leni += XFASTINT (len);
    }

19278:50f47ef6ce9a

  for (argnum = 0, leni = 0; argnum < nargs; argnum++)
    {
      this = args[argnum];
      len = Flength (this);
      if ((VECTORP (this) || CONSP (this)) && target_type == Lisp_String)

	{
	  /* We must pay attention to a multibyte character which
             takes more than one byte in string.  */
	  int i;
	  Lisp_Object ch;

	  if (VECTORP (this))
	    for (i = 0; i < XFASTINT (len); i++)
	      {
		ch = XVECTOR (this)->contents[i];
		if (! INTEGERP (ch))
		  wrong_type_argument (Qintegerp, ch);
		leni += Fchar_bytes (ch);
	      }
	  else
	    for (; CONSP (this); this = XCONS (this)->cdr)
	      {
		ch = XCONS (this)->car;
		if (! INTEGERP (ch))
		  wrong_type_argument (Qintegerp, ch);
		leni += Fchar_bytes (ch);
	      }
	}
      else
	leni += XFASTINT (len);
    }