* 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, 4 deletions

diff --git a/src/font.c b/src/font.c
index 6113e1c3e71..9e472fb3e3b 100644
--- a/src/font.c
+++ b/src/font.c
@@ -279,10 +279,8 @@ font_intern_prop (const char *str, ptrdiff_t len, bool force_symbol)
 
   if (SYMBOLP (tem))
     return tem;
-  if (len == nchars || len != nbytes)
-    tem = make_unibyte_string (str, len);
-  else
-    tem = make_multibyte_string (str, nchars, len);
+  tem = make_specified_string (str, nchars, len,
+                               len != nchars && len == nbytes);
   return Fintern (tem, obarray);
 }