comparison src/fns.c @ 18311:8b716cb12cdd

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

18310:a97ed8efcb6a

  for (argnum = 0, leni = 0; argnum < nargs; argnum++)
    {
      this = args[argnum];
      len = Flength (this);
      leni += XFASTINT (len);
    }

  XSETFASTINT (len, leni);

  if (target_type == Lisp_Cons)

	  else
	    {
	      while (!INTEGERP (elt))
		elt = wrong_type_argument (Qintegerp, elt);
	      {
#ifdef MASSC_REGISTER_BUG
		/* Even removing all "register"s doesn't disable this bug!
		   Nothing simpler than this seems to work. */
		unsigned char *p = & XSTRING (val)->data[toindex++];
		*p = XINT (elt);
#else
		XSTRING (val)->data[toindex++] = XINT (elt);
#endif
	      }
	    }
	}
    }
  if (!NILP (prev))

18311:8b716cb12cdd

  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);
    }

  XSETFASTINT (len, leni);

  if (target_type == Lisp_Cons)

	  else
	    {
	      while (!INTEGERP (elt))
		elt = wrong_type_argument (Qintegerp, elt);
	      {
		int c = XINT (elt);
		unsigned char work[4], *str;
		int i = CHAR_STRING (c, work, str);

#ifdef MASSC_REGISTER_BUG
		/* Even removing all "register"s doesn't disable this bug!
		   Nothing simpler than this seems to work. */
		unsigned char *p = & XSTRING (val)->data[toindex];
		bcopy (str, p, i);
#else
		bcopy (str, & XSTRING (val)->data[toindex], i);
#endif
		toindex += i;
	      }
	    }
	}
    }
  if (!NILP (prev))