4 files changed, 10 insertions, 20 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 92be5b00246..ea34def5ded 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-31  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * 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.
+
 2014-03-31  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsmenu.m (free_frame_tool_bar): Set wait_for_tool_bar = NO (Bug#16976)
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);
     }
 
diff --git a/src/w32term.c b/src/w32term.c
index 256d7506a3a..40c1e591233 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1078,10 +1078,7 @@ x_set_glyph_string_gc (struct glyph_string *s)
       s->stippled_p = s->face->stipple != 0;
     }
   else
-    {
-      s->gc = s->face->gc;
-      s->stippled_p = s->face->stipple != 0;
-    }
+    emacs_abort ();
 
   /* GC must have been set.  */
   eassert (s->gc != 0);
diff --git a/src/xterm.c b/src/xterm.c
index 31e1b9cb74f..1c0aea01f6e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -968,10 +968,7 @@ x_set_glyph_string_gc (struct glyph_string *s)
       s->stippled_p = s->face->stipple != 0;
     }
   else
-    {
-      s->gc = s->face->gc;
-      s->stippled_p = s->face->stipple != 0;
-    }
+    emacs_abort ();
 
   /* GC must have been set.  */
   eassert (s->gc != 0);