* search.c (Freplace_match): Use make_specified_string.

* xterm.c, w32term.c (x_set_glyph_string_gc): Use emacs_abort
to catch bogus override face of glyph strings.

1 files changed, 2 insertions, 12 deletions

diff --git a/src/search.c b/src/search.c
index 3de194c5056..9bec825abcd 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2679,18 +2679,8 @@ since only regular expressions have distinguished subexpressions.  */)
         }
 
       if (really_changed)
-        {
-          if (buf_multibyte)
-            {
-              ptrdiff_t nchars =
-                multibyte_chars_in_text (substed, substed_len);
-
-              newtext = make_multibyte_string ((char *) substed, nchars,
-                                               substed_len);
-            }
-          else
-            newtext = make_unibyte_string ((char *) substed, substed_len);
-        }
+        newtext = make_specified_string ((const char *) substed, -1,
+                                         substed_len, buf_multibyte);
       xfree (substed);
     }