(Fstring): If there is a multibyte char among

the args, always return a multibyte string.

2 files changed, 17 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index adcfb0089f9..f3a765f5661 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2000-01-25  Gerd Moellmann  <gerd@gnu.org>
 
+        * charset.c (Fstring): If there is a multibyte char among
+        the args, always return a multibyte string.
+
+2000-01-25  Gerd Moellmann  <gerd@gnu.org>
+
         * sysdep.c (sys_select): Turn atimers off and on instead of
         recording and restoring old alarm handler
 
diff --git a/src/charset.c b/src/charset.c
index 104756ded65..eb930ccf074 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1361,19 +1361,26 @@ DEFUN ("string", Fstring, Sstring, 1, MANY, 0,
   unsigned char *buf = (unsigned char *) alloca (MAX_MULTIBYTE_LENGTH * n);
   unsigned char *p = buf;
   Lisp_Object val;
-  int c;
+  int c, multibyte_p = 0;
 
   for (i = 0; i < n; i++)
     {
-      if (!INTEGERP (args[i]))
-        CHECK_NUMBER (args[i], 0);
+      CHECK_NUMBER (args[i], 0);
       c = XINT (args[i]);
       p += CHAR_STRING (c, p);
+
+      if (!SINGLE_BYTE_CHAR_P (c))
+        multibyte_p = 1;
     }
 
   /* Here, we can't use make_string_from_bytes because of byte
-     combining problem.  */
-  val = make_string (buf, p - buf);
+     combining problem.  Make a multibyte string if there is any
+     multibyte character in ARGS to make sure that `(insert 2276)'
+     returns a multibyte string if running --unibyte.  */
+  if (multibyte_p)
+    val = make_multibyte_string (buf, n, p - buf);
+  else
+    val = make_unibyte_string (buf, p - buf);
   return val;
 }