[Emacs-diffs] trunk r117356: * lisp.h (STRING_COPYIN): Remove; unused.

[Dmitry Antipov]

------------------------------------------------------------
revno: 117356
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2014-06-17 17:41:14 +0400
message:
  * lisp.h (STRING_COPYIN): Remove; unused.
  * ccl.c (Fccl_execute_on_string):
  * font.c (fon_intern_prop): Use make_specified_string.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/ccl.c                      ccl.c-20091113204419-o5vbwnq5f7feedwu-1073
  src/font.c                     font.c-20091113204419-o5vbwnq5f7feedwu-8540
  src/lisp.h                     lisp.h-20091113204419-o5vbwnq5f7feedwu-253

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-17 03:40:29 +0000
+++ b/src/ChangeLog     2014-06-17 13:41:14 +0000
@@ -3,10 +3,13 @@
        * fileio.c (Fread_file_name): Do not pass redundant args and ...
        * callint.c (read_file_name): ... convert to static here.
        * lisp.h (Fread_file_name): Do not EXFUN it.
+       (STRING_COPYIN): Remove; unused.
        * composite.c (CHAR_COMPOSABLE_P): Replace unsafe macro with ...
        (char_composable_p): ... static function.  All users changed.
        * eval.c (toplevel): Remove redundant #include directives.
        * xterm.c (x_initialize): Add static to match prototype.
+       * ccl.c (Fccl_execute_on_string):
+       * font.c (fon_intern_prop): Use make_specified_string.
 
 2014-06-16  Paul Eggert  <address@hidden>
 

=== modified file 'src/ccl.c'
--- a/src/ccl.c 2014-01-01 07:43:34 +0000
+++ b/src/ccl.c 2014-06-17 13:41:14 +0000
@@ -2160,11 +2160,8 @@
     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;

=== modified file 'src/font.c'
--- a/src/font.c        2014-06-10 03:32:36 +0000
+++ b/src/font.c        2014-06-17 13:41:14 +0000
@@ -279,10 +279,8 @@
 
   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);
 }
 

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2014-06-17 03:14:00 +0000
+++ b/src/lisp.h        2014-06-17 13:41:14 +0000
@@ -1197,12 +1197,6 @@
 {
   XSTRING (string)->size = newsize;
 }
-INLINE void
-STRING_COPYIN (Lisp_Object string, ptrdiff_t index, char const *new,
-              ptrdiff_t count)
-{
-  memcpy (SDATA (string) + index, new, count);
-}
 
 /* Header of vector-like objects.  This documents the layout constraints on
    vectors and pseudovectors (objects of PVEC_xxx subtype).  It also prevents