Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-482
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-483
   Build-in-place tweak

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-484
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-228

1 files changed, 5 insertions, 3 deletions

diff --git a/src/fileio.c b/src/fileio.c
index a05d7689c12..180f6f94130 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -888,7 +888,7 @@ make_temp_name (prefix, base64_p)
      int base64_p;
 {
   Lisp_Object val;
-  int len;
+  int len, clen;
   int pid;
   unsigned char *p, *data;
   char pidbuf[20];
@@ -923,8 +923,10 @@ make_temp_name (prefix, base64_p)
 #endif
     }
 
-  len = SCHARS (prefix);
-  val = make_uninit_string (len + 3 + pidlen);
+  len = SBYTES (prefix); clen = SCHARS (prefix);
+  val = make_uninit_multibyte_string (clen + 3 + pidlen, len + 3 + pidlen);
+  if (!STRING_MULTIBYTE (prefix))
+    STRING_SET_UNIBYTE (val);
   data = SDATA (val);
   bcopy(SDATA (prefix), data, len);
   p = data + len;