* lisp.h (STRING_COPYIN): Remove; unused.

* ccl.c (Fccl_execute_on_string):
* font.c (fon_intern_prop): Use make_specified_string.

1 files changed, 2 insertions, 5 deletions

diff --git a/src/ccl.c b/src/ccl.c
index 187f6027018..54093bf5677 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -2160,11 +2160,8 @@ usage: (ccl-execute-on-string CCL-PROGRAM STATUS STRING &optional CONTINUE UNIBY
     ASET (status, i, make_number (ccl.reg[i]));
   ASET (status, 8, make_number (ccl.ic));
 
-  if (NILP (unibyte_p))
-    val = make_multibyte_string ((char *) outbuf, produced_chars,
-                                 outp - outbuf);
-  else
-    val = make_unibyte_string ((char *) outbuf, produced_chars);
+  val = make_specified_string ((const char *) outbuf, produced_chars,
+                               outp - outbuf, NILP (unibyte_p));
   xfree (outbuf);
 
   return val;